diff options
| author | Kuniyuki Iwashima <kuniyu@amazon.com> | 2022-08-23 10:46:56 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-08-24 13:46:58 +0100 |
| commit | af67508ea6cbf0e4ea27f8120056fa2efce127dd (patch) | |
| tree | 9b3e900cfdc3f2e507d8f85ec4ef9f608dfff48a | |
| parent | fa45d484c52c73f79db2c23b0cdfc6c6455093ad (diff) | |
| download | linux-rpi-af67508ea6cbf0e4ea27f8120056fa2efce127dd.tar.gz linux-rpi-af67508ea6cbf0e4ea27f8120056fa2efce127dd.tar.bz2 linux-rpi-af67508ea6cbf0e4ea27f8120056fa2efce127dd.zip | |
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: 79134e6ce2c9 ("net: do not create fallback tunnels for non-default namespaces")
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/netdevice.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 1a3cb93c3dcc..6d3a33fd0cdb 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -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) |