Commit af67508e authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by David S. Miller
Browse files

net: Fix data-races around sysctl_fb_tunnels_only_for_init_net. 



While reading sysctl_fb_tunnels_only_for_init_net, it can be changed
concurrently.  Thus, we need to add READ_ONCE() to its readers.

Fixes: 79134e6c ("net: do not create fallback tunnels for non-default namespaces")
Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fa45d484

include/linux/netdevice.h

+8 −3
Original line number Diff line number Diff line
@@ -640,9 +640,14 @@ extern int sysctl_devconf_inherit_init_net; 
 */

static inline bool net_has_fallback_tunnels(const struct net *net)

{

	return !IS_ENABLED(CONFIG_SYSCTL) ||

	       !sysctl_fb_tunnels_only_for_init_net ||

	       (net == &init_net && sysctl_fb_tunnels_only_for_init_net == 1);

#if IS_ENABLED(CONFIG_SYSCTL)

	int fb_tunnels_only_for_init_net = READ_ONCE(sysctl_fb_tunnels_only_for_init_net);



	return !fb_tunnels_only_for_init_net ||

		(net_eq(net, &init_net) && fb_tunnels_only_for_init_net == 1);

#else

	return true;

#endif

}



static inline int netdev_queue_numa_node_read(const struct netdev_queue *q)