rxrpc: Don't assume anything about the address in an ICMP packet
authorDavid Howells <dhowells@redhat.com>
Mon, 4 Apr 2016 13:00:33 +0000 (14:00 +0100)
committerDavid Howells <dhowells@redhat.com>
Wed, 15 Jun 2016 09:15:08 +0000 (10:15 +0100)
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@redhat.com>
net/rxrpc/peer_event.c

index 80de84257227c7580a2a8aeb191d052d811cffdb..6ba798d6659ecae7a3b6f22ad5a8dff2684befb7 100644 (file)
@@ -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))