Unverified Commit d8e3bcbb authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7018 fix CVE-2024-26865 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/WKNSMJGVE4MC5HRGLKX7OOQF6YO3O7PA/ 
Fix CVE-2024-26865.

Eric Dumazet (1):
  tcp: Fix NEW_SYN_RECV handling in inet_twsk_purge()

Kuniyuki Iwashima (1):
  tcp: Clean up kernel listener's reqsk in inet_twsk_purge()


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/I9HK3Q 
 
Link:https://gitee.com/openeuler/kernel/pulls/7018

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 34c4be6c 9a5dccc0

net/ipv4/inet_timewait_sock.c

+20 −11
Original line number Diff line number Diff line
@@ -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,25 +268,34 @@ 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)

			int state = inet_sk_state_load(sk);



			if ((1 << state) & ~(TCPF_TIME_WAIT |

					     TCPF_NEW_SYN_RECV))

				continue;

			tw = inet_twsk(sk);

			if ((tw->tw_family != family) ||

				refcount_read(&twsk_net(tw)->count))

			if (sk->sk_family != family ||

			    refcount_read(&sock_net(sk)->count))

				continue;



			if (unlikely(!refcount_inc_not_zero(&tw->tw_refcnt)))

			if (unlikely(!refcount_inc_not_zero(&sk->sk_refcnt)))

				continue;



			if (unlikely((tw->tw_family != family) ||

				     refcount_read(&twsk_net(tw)->count))) {

				inet_twsk_put(tw);

			if (unlikely(sk->sk_family != family ||

				     refcount_read(&sock_net(sk)->count))) {

				sock_gen_put(sk);

				goto restart;

			}



			rcu_read_unlock();

			local_bh_disable();

			inet_twsk_deschedule_put(tw);

			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);

			}

			local_bh_enable();

			goto restart_rcu;

		}