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

!8724 tcp: Use refcount_inc_not_zero() in tcp_twsk_unique(). 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/TGDIHFHPUAIDPQLKFNJF7PI5S4VPX3QC/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9U4LA 
 
Link:https://gitee.com/openeuler/kernel/pulls/8724

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 80c58584 fe4cd78b

net/ipv4/tcp_ipv4.c

+7 −1
Original line number Diff line number Diff line
@@ -151,6 +151,12 @@ int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp) 
	if (tcptw->tw_ts_recent_stamp &&

	    (!twp || (reuse && time_after32(ktime_get_seconds(),

					    tcptw->tw_ts_recent_stamp)))) {

		/* inet_twsk_hashdance() sets sk_refcnt after putting twsk

		 * and releasing the bucket lock.

		 */

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

			return 0;



		/* In case of repair and re-using TIME-WAIT sockets we still

		 * want to be sure that it is safe as above but honor the

		 * sequence numbers and time stamps set as part of the repair
@@ -171,7 +177,7 @@ int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp) 
			tp->rx_opt.ts_recent	   = tcptw->tw_ts_recent;

			tp->rx_opt.ts_recent_stamp = tcptw->tw_ts_recent_stamp;

		}

		sock_hold(sktw);



		return 1;

	}