From: David Howells <dhowells@redhat.com>
To: netdev@vger.kernel.org
Cc: dhowells@redhat.com, linux-afs@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH net 1/6] rxrpc: Clear socket error
Date: Fri, 12 Apr 2019 16:33:40 +0100 [thread overview]
Message-ID: <155508322002.11035.7602569766057291907.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <155508321298.11035.7196100250886302901.stgit@warthog.procyon.org.uk>
From: Marc Dionne <marc.dionne@auristor.com>
When an ICMP or ICMPV6 error is received, the error will be attached
to the socket (sk_err) and the report function will get called.
Clear any pending error here by calling sock_error().
This would cause the following attempt to use the socket to fail with
the error code stored by the ICMP error, resulting in unexpected errors
with various side effects depending on the context.
Signed-off-by: Marc Dionne <marc.dionne@auristor.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Tested-by: Jonathan Billings <jsbillin@umich.edu>
---
net/rxrpc/peer_event.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/net/rxrpc/peer_event.c b/net/rxrpc/peer_event.c
index bc05af89fc38..6e84d878053c 100644
--- a/net/rxrpc/peer_event.c
+++ b/net/rxrpc/peer_event.c
@@ -157,6 +157,11 @@ void rxrpc_error_report(struct sock *sk)
_enter("%p{%d}", sk, local->debug_id);
+ /* Clear the outstanding error value on the socket so that it doesn't
+ * cause kernel_sendmsg() to return it later.
+ */
+ sock_error(sk);
+
skb = sock_dequeue_err_skb(sk);
if (!skb) {
_leave("UDP socket errqueue empty");
next prev parent reply other threads:[~2019-04-12 15:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-12 15:33 [PATCH net 0/6] rxrpc: Fixes David Howells
2019-04-12 15:33 ` David Howells [this message]
2019-04-12 15:33 ` [PATCH net 2/6] rxrpc: Make rxrpc_kernel_check_life() indicate if call completed David Howells
2019-04-12 15:33 ` [PATCH net 3/6] rxrpc: Allow errors to be returned from rxrpc_queue_packet() David Howells
2019-04-12 15:34 ` [PATCH net 4/6] afs: Check for rxrpc call completion in wait loop David Howells
2019-04-12 15:34 ` [PATCH net 5/6] rxrpc: Trace received connection aborts David Howells
2019-04-12 15:34 ` [PATCH net 6/6] rxrpc: Fix detection of out of order acks David Howells
2019-04-12 23:58 ` [PATCH net 0/6] rxrpc: Fixes 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=155508322002.11035.7602569766057291907.stgit@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--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
all inboxes | Powered by JetHome®