提交 c0808a80 编写于 作者: K Kuniyuki Iwashima 提交者: Zheng Zengkai

net: Fix data-races around sysctl_fb_tunnels_only_for_init_net.

stable inclusion
from stable-v5.10.140
commit 371a3bcf3144584c511f80e87d4c28ac2c75e9a7
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I63FTT

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=371a3bcf3144584c511f80e87d4c28ac2c75e9a7

--------------------------------

[ Upstream commit af67508e ]

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: NKuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
上级 dbdc517e
...@@ -647,9 +647,14 @@ extern int sysctl_devconf_inherit_init_net; ...@@ -647,9 +647,14 @@ extern int sysctl_devconf_inherit_init_net;
*/ */
static inline bool net_has_fallback_tunnels(const struct net *net) static inline bool net_has_fallback_tunnels(const struct net *net)
{ {
return !IS_ENABLED(CONFIG_SYSCTL) || #if IS_ENABLED(CONFIG_SYSCTL)
!sysctl_fb_tunnels_only_for_init_net || int fb_tunnels_only_for_init_net = READ_ONCE(sysctl_fb_tunnels_only_for_init_net);
(net == &init_net && sysctl_fb_tunnels_only_for_init_net == 1);
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) static inline int netdev_queue_numa_node_read(const struct netdev_queue *q)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册