linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Howells <dhowells@redhat.com>
To: davem@davemloft.net
Cc: dhowells@redhat.com, netdev@vger.kernel.org,
	linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH net-next 4/8] rxrpc: Don't assume anything about the address in an ICMP packet
Date: Wed, 15 Jun 2016 17:42:06 +0100	[thread overview]
Message-ID: <146600892656.18270.13704590800333247497.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <146600889842.18270.2306896489831492957.stgit@warthog.procyon.org.uk>

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 |    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))

  parent reply	other threads:[~2016-06-15 16:42 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-15 16:41 [PATCH net-next 0/8] rxrpc: Rework endpoint record handling David Howells
2016-06-15 16:41 ` [PATCH net-next 1/8] rxrpc: Rework peer object handling to use hash table and RCU David Howells
2016-06-15 16:41 ` [PATCH net-next 2/8] rxrpc: Rename rxrpc_UDP_error_report() to rxrpc_error_report() David Howells
2016-06-15 16:41 ` [PATCH net-next 3/8] rxrpc: Break MTU determination from ICMP into its own function David Howells
2016-06-15 16:42 ` David Howells [this message]
2016-06-15 16:42 ` [PATCH net-next 5/8] rxrpc: Do a little bit of tidying in the ICMP processing David Howells
2016-06-15 16:42 ` [PATCH net-next 6/8] rxrpc: Use the peer record to distribute network errors David Howells
2016-06-15 16:42 ` [PATCH net-next 7/8] rxrpc: Separate local endpoint event handling out into its own file David Howells
2016-06-15 16:42 ` [PATCH net-next 8/8] rxrpc: Rework local endpoint management David Howells
2016-06-16  5:25 ` [PATCH net-next 0/8] rxrpc: Rework endpoint record handling David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=146600892656.18270.13704590800333247497.stgit@warthog.procyon.org.uk \
    --to=dhowells@redhat.com \
    --cc=davem@davemloft.net \
    --cc=linux-afs@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).