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,5.15 1/2] Revert "tcp: Fix NEW_SYN_RECV handling in inet_twsk_purge()"
Date: Mon, 6 May 2024 11:05:53 +0800 [thread overview]
Message-ID: <20240506030554.3168143-2-shaozhengchao@huawei.com> (raw)
In-Reply-To: <20240506030554.3168143-1-shaozhengchao@huawei.com>
This reverts commit 4fa0befa92f2adaef8eb268f724f38a213ab7dcc.
In order to revert commit 214a2dfbb84f("tcp: Clean up kernel listener's
reqsk in inet_twsk_purge()"), revert this patch.
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
net/ipv4/inet_timewait_sock.c | 41 +++++++++++++++++++----------------
1 file changed, 22 insertions(+), 19 deletions(-)
diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c
index 25809e06f111..9b891d6296ec 100644
--- a/net/ipv4/inet_timewait_sock.c
+++ b/net/ipv4/inet_timewait_sock.c
@@ -254,12 +254,12 @@ void __inet_twsk_schedule(struct inet_timewait_sock *tw, int timeo, bool rearm)
}
EXPORT_SYMBOL_GPL(__inet_twsk_schedule);
-/* Remove all non full sockets (TIME_WAIT and NEW_SYN_RECV) for dead netns */
void inet_twsk_purge(struct inet_hashinfo *hashinfo, int family)
{
+ struct inet_timewait_sock *tw;
+ struct sock *sk;
struct hlist_nulls_node *node;
unsigned int slot;
- struct sock *sk;
for (slot = 0; slot <= hashinfo->ehash_mask; slot++) {
struct inet_ehash_bucket *head = &hashinfo->ehash[slot];
@@ -268,35 +268,38 @@ void inet_twsk_purge(struct inet_hashinfo *hashinfo, int family)
rcu_read_lock();
restart:
sk_nulls_for_each_rcu(sk, node, &head->chain) {
- int state = inet_sk_state_load(sk);
+ 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 ((1 << state) & ~(TCPF_TIME_WAIT |
- TCPF_NEW_SYN_RECV))
continue;
+ }
- if (sk->sk_family != family ||
- refcount_read(&sock_net(sk)->ns.count))
+ tw = inet_twsk(sk);
+ if ((tw->tw_family != family) ||
+ refcount_read(&twsk_net(tw)->ns.count))
continue;
- if (unlikely(!refcount_inc_not_zero(&sk->sk_refcnt)))
+ if (unlikely(!refcount_inc_not_zero(&tw->tw_refcnt)))
continue;
- if (unlikely(sk->sk_family != family ||
- refcount_read(&sock_net(sk)->ns.count))) {
- sock_gen_put(sk);
+ if (unlikely((tw->tw_family != family) ||
+ refcount_read(&twsk_net(tw)->ns.count))) {
+ inet_twsk_put(tw);
goto restart;
}
rcu_read_unlock();
local_bh_disable();
- if (state == TCP_TIME_WAIT) {
- inet_twsk_deschedule_put(inet_twsk(sk));
- } else {
- struct request_sock *req = inet_reqsk(sk);
-
- inet_csk_reqsk_queue_drop_and_put(req->rsk_listener,
- req);
- }
+ inet_twsk_deschedule_put(tw);
local_bh_enable();
goto restart_rcu;
}
--
2.34.1
next prev parent reply other threads:[~2024-05-06 3:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-06 3:05 [PATCH stable,5.15 0/2] Revert the patchset for fix CVE-2024-26865 Zhengchao Shao
2024-05-06 3:05 ` Zhengchao Shao [this message]
2024-05-06 3:05 ` [PATCH stable,5.15 2/2] Revert "tcp: Clean up kernel listener's reqsk in inet_twsk_purge()" Zhengchao Shao
2024-05-23 11:34 ` [PATCH stable,5.15 0/2] Revert the patchset for fix CVE-2024-26865 Greg KH
2024-05-25 9:33 ` shaozhengchao
2024-05-25 9:42 ` Greg KH
2024-05-25 10:21 ` shaozhengchao
2024-05-25 10:42 ` Greg KH
2024-05-29 7:59 ` shaozhengchao
2024-05-29 10:02 ` Greg KH
2024-05-23 11:39 ` Greg KH
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=20240506030554.3168143-2-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).