From: Jakub Kicinski <kuba@kernel.org>
To: eric.dumazet@gmail.com
Cc: willemb@google.com, netdev@vger.kernel.org,
Jakub Kicinski <kuba@kernel.org>
Subject: [RFC net] net: stream: don't purge sk_error_queue without holding its lock
Date: Mon, 13 Sep 2021 15:38:50 -0700 [thread overview]
Message-ID: <20210913223850.660578-1-kuba@kernel.org> (raw)
sk_stream_kill_queues() can be called when there are still
outstanding skbs to transmit. Those skbs may try to queue
notifications to the error queue (e.g. timestamps).
If sk_stream_kill_queues() purges the queue without taking
its lock the queue may get corrupted.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
Sending as an RFC for review, compile-tested only.
Seems far more likely that I'm missing something than that
this has been broken forever and nobody noticed :S
---
net/core/stream.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/core/stream.c b/net/core/stream.c
index 4f1d4aa5fb38..7c585088f394 100644
--- a/net/core/stream.c
+++ b/net/core/stream.c
@@ -196,7 +196,7 @@ void sk_stream_kill_queues(struct sock *sk)
__skb_queue_purge(&sk->sk_receive_queue);
/* Next, the error queue. */
- __skb_queue_purge(&sk->sk_error_queue);
+ skb_queue_purge(&sk->sk_error_queue);
/* Next, the write queue. */
WARN_ON(!skb_queue_empty(&sk->sk_write_queue));
--
2.31.1
next reply other threads:[~2021-09-13 22:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-13 22:38 Jakub Kicinski [this message]
2021-09-14 5:14 ` [RFC net] net: stream: don't purge sk_error_queue without holding its lock Eric Dumazet
2021-09-14 14:18 ` Jakub Kicinski
2021-09-14 16:32 ` Eric Dumazet
2021-09-14 16:56 ` Jakub Kicinski
2021-09-14 17:55 ` Eric Dumazet
2021-09-14 18:03 ` Jakub Kicinski
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=20210913223850.660578-1-kuba@kernel.org \
--to=kuba@kernel.org \
--cc=eric.dumazet@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=willemb@google.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.