summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Xing <kernelxing@tencent.com>2024-03-04 16:20:38 +0800
committerSasha Levin <sashal@kernel.org>2024-03-15 10:48:16 -0400
commitfed835d415766a94fc0246dcebc3af4c03fe9941 (patch)
treea0b683b3bad0b9bc45f30a845303522821985a04
parenta47d68d777b41862757b7e3051f2d46d6e25f87b (diff)
downloadlinux-stable-fed835d415766a94fc0246dcebc3af4c03fe9941.tar.gz
linux-stable-fed835d415766a94fc0246dcebc3af4c03fe9941.tar.bz2
linux-stable-fed835d415766a94fc0246dcebc3af4c03fe9941.zip
netrom: Fix a data-race around sysctl_netrom_transport_timeout
[ Upstream commit 60a7a152abd494ed4f69098cf0f322e6bb140612 ] We need to protect the reader reading the sysctl value because the value can be changed concurrently. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Jason Xing <kernelxing@tencent.com> Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--net/netrom/af_netrom.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index ec5747969f96..3c6567af2ba4 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -453,7 +453,7 @@ static int nr_create(struct net *net, struct socket *sock, int protocol,
nr_init_timers(sk);
nr->t1 =
- msecs_to_jiffies(sysctl_netrom_transport_timeout);
+ msecs_to_jiffies(READ_ONCE(sysctl_netrom_transport_timeout));
nr->t2 =
msecs_to_jiffies(sysctl_netrom_transport_acknowledge_delay);
nr->n2 =