summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuniyuki Iwashima <kuniyu@amazon.com>2022-07-18 10:26:43 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-07-29 17:28:11 +0200
commitcb0d28934ca10f99c47e2c6f451405d6c954fe48 (patch)
tree02474c23e6ffedde27d42dd1e527cca5fccf4d56
parentef699813d99cc29e6e25c9f6da7766526cc8bd6e (diff)
downloadlinux-stable-cb0d28934ca10f99c47e2c6f451405d6c954fe48.tar.gz
linux-stable-cb0d28934ca10f99c47e2c6f451405d6c954fe48.tar.bz2
linux-stable-cb0d28934ca10f99c47e2c6f451405d6c954fe48.zip
udp: Fix a data-race around sysctl_udp_l3mdev_accept.
[ Upstream commit 3d72bb4188c708bb16758c60822fc4dda7a95174 ] While reading sysctl_udp_l3mdev_accept, it can be changed concurrently. Thus, we need to add READ_ONCE() to its reader. Fixes: 63a6fff353d0 ("net: Avoid receiving packets with an l3mdev on unbound UDP sockets") Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--include/net/udp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/udp.h b/include/net/udp.h
index 07d0ceadcf6e..abe91ab9030d 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -238,7 +238,7 @@ static inline bool udp_sk_bound_dev_eq(struct net *net, int bound_dev_if,
int dif, int sdif)
{
#if IS_ENABLED(CONFIG_NET_L3_MASTER_DEV)
- return inet_bound_dev_eq(!!net->ipv4.sysctl_udp_l3mdev_accept,
+ return inet_bound_dev_eq(!!READ_ONCE(net->ipv4.sysctl_udp_l3mdev_accept),
bound_dev_if, dif, sdif);
#else
return inet_bound_dev_eq(true, bound_dev_if, dif, sdif);