Unverified Commit 078e0901 authored Nov 12, 2024 by openeuler-ci-bot Committed by Gitee Nov 12, 2024

!13150 net: fix data-races around sk->sk_forward_alloc

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Liang <wangliang74@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/CGM2M3UBSZTFJBT5HADVD2X5S574MMYA/ 
 
https://gitee.com/openeuler/kernel/issues/IB2CPU 
 
Link:https://gitee.com/openeuler/kernel/pulls/13150

 

Reviewed-by: Yue Haibing <yuehaibing@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>

parents bafa65a8 d6c99954

net/dccp/ipv6.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -602,7 +602,7 @@ static int dccp_v6_do_rcv(struct sock sk, struct sk_buff skb)
		by tcp. Feel free to propose better solution.
		--ANK (980728)
		*/
		if (np->rxopt.all)
		if (np->rxopt.all && sk->sk_state != DCCP_LISTEN)
		opt_skb = skb_clone_and_charge_r(skb, sk);

		if (sk->sk_state == DCCP_OPEN) { /* Fast path */

net/ipv6/tcp_ipv6.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -1330,7 +1330,7 @@ static int tcp_v6_do_rcv(struct sock sk, struct sk_buff skb)
		by tcp. Feel free to propose better solution.
		--ANK (980728)
		*/
		if (np->rxopt.all)
		if (np->rxopt.all && sk->sk_state != TCP_LISTEN)
		opt_skb = skb_clone_and_charge_r(skb, sk);

		if (sk->sk_state == TCP_ESTABLISHED) { /* Fast path */
		@@ -1367,8 +1367,6 @@ static int tcp_v6_do_rcv(struct sock sk, struct sk_buff skb)
		if (nsk != sk) {
		if (tcp_child_process(sk, nsk, skb))
		goto reset;
		if (opt_skb)
		__kfree_skb(opt_skb);
		return 0;
		}
		} else