Commit fdb5fd7f authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

tcp: sk->sk_bound_dev_if once in inet_request_bound_dev_if() 



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: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a20ea298

include/net/inet_sock.h

+3 −2
Original line number Diff line number Diff line
@@ -116,14 +116,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,

					    struct sk_buff *skb)

{

	int bound_dev_if = READ_ONCE(sk->sk_bound_dev_if);

#ifdef CONFIG_NET_L3_MASTER_DEV

	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);

#endif



	return sk->sk_bound_dev_if;

	return bound_dev_if;

}



static inline int inet_sk_bound_l3mdev(const struct sock *sk)