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

!7336 inet: read sk->sk_family once in inet_recv_error() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Guo Mengqi <guomengqi3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/AEXCPE5DNTBE3COKUEBGJ4YDBRJBSRA3/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9DNRC 
 
Link:https://gitee.com/openeuler/kernel/pulls/7336

 

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

net/ipv4/af_inet.c

+4 −2
Original line number Diff line number Diff line
@@ -1609,10 +1609,12 @@ EXPORT_SYMBOL(inet_current_timestamp); 


int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)

{

	if (sk->sk_family == AF_INET)

	unsigned int family = READ_ONCE(sk->sk_family);



	if (family == AF_INET)

		return ip_recv_error(sk, msg, len, addr_len);

#if IS_ENABLED(CONFIG_IPV6)

	if (sk->sk_family == AF_INET6)

	if (family == AF_INET6)

		return pingv6_ops.ipv6_recv_error(sk, msg, len, addr_len);

#endif

	return -EINVAL;