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

!11189 tcp: fix race in tcp_v6_syn_recv_sock() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yue Haibing <yuehaibing@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2HMX5WQPNV6ONK4X773QICTBI5QP3J2B/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAMPH5 
 
Link:https://gitee.com/openeuler/kernel/pulls/11189

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 163da6b0 308535fd

net/ipv6/tcp_ipv6.c

+2 −1
Original line number Diff line number Diff line
@@ -1176,7 +1176,6 @@ static struct sock *tcp_v6_syn_recv_sock(const struct sock *sk, struct sk_buff * 
	 */



	newsk->sk_gso_type = SKB_GSO_TCPV6;

	ip6_dst_store(newsk, dst, NULL, NULL);

	inet6_sk_rx_dst_set(newsk, skb);



	newtcp6sk = (struct tcp6_sock *)newsk;
@@ -1188,6 +1187,8 @@ static struct sock *tcp_v6_syn_recv_sock(const struct sock *sk, struct sk_buff * 


	memcpy(newnp, np, sizeof(struct ipv6_pinfo));



	ip6_dst_store(newsk, dst, NULL, NULL);



	newsk->sk_v6_daddr = ireq->ir_v6_rmt_addr;

	newnp->saddr = ireq->ir_v6_loc_addr;

	newsk->sk_v6_rcv_saddr = ireq->ir_v6_loc_addr;