xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tcp: sk->sk_bound_dev_if once in inet_request_bound_dev_if()

Browse Source 
[ Upstream commit fdb5fd7f736ec7ae9fb36d2842ea6d9ebc4e7269 ]

inet_request_bound_dev_if() reads sk->sk_bound_dev_if twice
while listener socket is not locked.

Another cpu could change this field under us.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Eric Dumazet
2022-05-13 11:55:43 -07:00
committed by Greg Kroah-Hartman
parent f7884d9500
commit b7325b27d8
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/net/inet_sock.h
View File

@@ -117,14 +117,15 @@ static inline u32 inet_request_mark(const struct sock *sk, struct sk_buff *skb)
static inline int inet_request_bound_dev_if(const struct sock *sk, static inline int inet_request_bound_dev_if(const struct sock *sk,
struct sk_buff *skb) struct sk_buff *skb)
{ {
int bound_dev_if = READ_ONCE(sk->sk_bound_dev_if);
#ifdef CONFIG_NET_L3_MASTER_DEV #ifdef CONFIG_NET_L3_MASTER_DEV
struct net *net = sock_net(sk); struct net *net = sock_net(sk);
if (!sk->sk_bound_dev_if && net->ipv4.sysctl_tcp_l3mdev_accept) if (!bound_dev_if && net->ipv4.sysctl_tcp_l3mdev_accept)
return l3mdev_master_ifindex_by_index(net, skb->skb_iif); return l3mdev_master_ifindex_by_index(net, skb->skb_iif);
#endif #endif
return sk->sk_bound_dev_if; return bound_dev_if;
} }
static inline int inet_sk_bound_l3mdev(const struct sock *sk) static inline int inet_sk_bound_l3mdev(const struct sock *sk)