From: Zhengchao Shao <shaozhengchao@huawei.com>
To: <stable@vger.kernel.org>
Cc: <netdev@vger.kernel.org>, <gregkh@linuxfoundation.org>,
<davem@davemloft.net>, <kuznet@ms2.inr.ac.ru>,
<yoshfuji@linux-ipv6.org>, <kuba@kernel.org>,
<edumazet@google.com>, <kuniyu@amazon.com>,
<weiyongjun1@huawei.com>, <yuehaibing@huawei.com>,
<shaozhengchao@huawei.com>
Subject: [PATCH stable,4.19 2/2] Revert "tcp: Clean up kernel listener's reqsk in inet_twsk_purge()"
Date: Mon, 6 May 2024 11:22:40 +0800 [thread overview]
Message-ID: <20240506032240.3170844-3-shaozhengchao@huawei.com> (raw)
In-Reply-To: <20240506032240.3170844-1-shaozhengchao@huawei.com>
This reverts commit 9f06ebd1daf5914afb21b95781cf637a025e9f9a.
There's no "pernet" variable in the struct hashinfo. The "pernet" variable
is introduced from v6.1-rc1. Revert this patch.
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
net/ipv4/inet_timewait_sock.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c
index 0ab4e0e28baf..88c5069b5d20 100644
--- a/net/ipv4/inet_timewait_sock.c
+++ b/net/ipv4/inet_timewait_sock.c
@@ -267,21 +267,8 @@ void inet_twsk_purge(struct inet_hashinfo *hashinfo, int family)
rcu_read_lock();
restart:
sk_nulls_for_each_rcu(sk, node, &head->chain) {
- if (sk->sk_state != TCP_TIME_WAIT) {
- /* A kernel listener socket might not hold refcnt for net,
- * so reqsk_timer_handler() could be fired after net is
- * freed. Userspace listener and reqsk never exist here.
- */
- if (unlikely(sk->sk_state == TCP_NEW_SYN_RECV &&
- hashinfo->pernet)) {
- struct request_sock *req = inet_reqsk(sk);
-
- inet_csk_reqsk_queue_drop_and_put(req->rsk_listener, req);
- }
-
+ if (sk->sk_state != TCP_TIME_WAIT)
continue;
- }
-
tw = inet_twsk(sk);
if ((tw->tw_family != family) ||
refcount_read(&twsk_net(tw)->count))
--
2.34.1
prev parent reply other threads:[~2024-05-06 3:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-06 3:22 [PATCH stable,4.19 0/2] Revert the patchset for fix CVE-2024-26865 Zhengchao Shao
2024-05-06 3:22 ` [PATCH stable,4.19 1/2] Revert "tcp: Fix NEW_SYN_RECV handling in inet_twsk_purge()" Zhengchao Shao
2024-05-06 3:22 ` Zhengchao Shao [this message]
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=20240506032240.3170844-3-shaozhengchao@huawei.com \
--to=shaozhengchao@huawei.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=kuba@kernel.org \
--cc=kuniyu@amazon.com \
--cc=kuznet@ms2.inr.ac.ru \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=weiyongjun1@huawei.com \
--cc=yoshfuji@linux-ipv6.org \
--cc=yuehaibing@huawei.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 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 read-only IMAP folder(s) and NNTP newsgroup(s).