netdev - Re: [PATCH stable,5.4 2/2] Revert "tcp: Clean up kernel listener's reqsk in inet_twsk

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <ae814090-a184-164f-7391-f46c02b5d807@huawei.com>
Date: Mon, 6 May 2024 12:21:46 +0800
From: shaozhengchao <shaozhengchao@...wei.com>
To: <stable@...r.kernel.org>
CC: <netdev@...r.kernel.org>, <gregkh@...uxfoundation.org>,
	<davem@...emloft.net>, <kuznet@....inr.ac.ru>, <yoshfuji@...ux-ipv6.org>,
	<kuba@...nel.org>, <edumazet@...gle.com>, <kuniyu@...zon.com>,
	<weiyongjun1@...wei.com>, <yuehaibing@...wei.com>
Subject: Re: [PATCH stable,5.4 2/2] Revert "tcp: Clean up kernel listener's
 reqsk in inet_twsk_purge()"


The patchset's format is incorrect, please drop it.

On 2024/5/6 11:17, Zhengchao Shao wrote:
> This reverts commit 53fab9cec2cda43d7161257dad5b546ea4be0018.
> 
> There's no "pernet" variable in the struct hashinfo. The "pernet" variable
> is introduced from v6.1-rc1. Revert this patch.
> 
> Fixes:
> Signed-off-by: Zhengchao Shao <shaozhengchao@...wei.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 04726bbd72dc..c411c87ae865 100644
> --- a/net/ipv4/inet_timewait_sock.c
> +++ b/net/ipv4/inet_timewait_sock.c
> @@ -268,21 +268,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))