From: David Howells Date: Mon, 4 Apr 2016 13:00:33 +0000 (+0100) Subject: rxrpc: Don't assume anything about the address in an ICMP packet X-Git-Tag: v5.15~13202^2~331^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1c1df86fad68dd7188ea498e796c9d2ede679421;p=platform%2Fkernel%2Flinux-starfive.git rxrpc: Don't assume anything about the address in an ICMP packet 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 --- diff --git a/net/rxrpc/peer_event.c b/net/rxrpc/peer_event.c index 80de842..6ba798d 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))