[PATCH net-next 4/8] rxrpc: Don't assume anything about the address in an ICMP packet

From: David Howells
Date: Wed Jun 15 2016 - 12:42:29 EST


Don't assume anything about the address in an ICMP packet in
rxrpc_error_report() as the address may not be IPv4 in future, especially
since we're just printing these details.

Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
---

net/rxrpc/peer_event.c | 8 --------
1 file changed, 8 deletions(-)

diff --git a/net/rxrpc/peer_event.c b/net/rxrpc/peer_event.c
index 80de84257227..6ba798d6659e 100644
--- a/net/rxrpc/peer_event.c
+++ b/net/rxrpc/peer_event.c
@@ -120,8 +120,6 @@ void rxrpc_error_report(struct sock *sk)
struct rxrpc_local *local = sk->sk_user_data;
struct rxrpc_peer *peer;
struct sk_buff *skb;
- __be32 addr;
- __be16 port;

_enter("%p{%d}", sk, local->debug_id);

@@ -139,12 +137,6 @@ void rxrpc_error_report(struct sock *sk)

rxrpc_new_skb(skb);

- addr = *(__be32 *)(skb_network_header(skb) + serr->addr_offset);
- port = serr->port;
-
- _net("Rx UDP Error from %pI4:%hu", &addr, ntohs(port));
- _debug("Msg l:%d d:%d", skb->len, skb->data_len);
-
rcu_read_lock();
peer = rxrpc_lookup_peer_icmp_rcu(local, skb);
if (peer && !rxrpc_get_peer_maybe(peer))