summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Xing <kernelxing@tencent.com>2024-03-04 16:20:40 +0800
committerSasha Levin <sashal@kernel.org>2024-03-15 10:48:20 -0400
commit7d56ffc51ebd2777ded8dca50d631ee19d97db5c (patch)
treeaabb13e071e37abe2ee9faf3b1c5d75339723022
parentfa3f3ab5c399852d32a0c3cbb8c55882f7e2c61f (diff)
downloadlinux-stable-7d56ffc51ebd2777ded8dca50d631ee19d97db5c.tar.gz
linux-stable-7d56ffc51ebd2777ded8dca50d631ee19d97db5c.tar.bz2
linux-stable-7d56ffc51ebd2777ded8dca50d631ee19d97db5c.zip
netrom: Fix a data-race around sysctl_netrom_transport_acknowledge_delay
[ Upstream commit 806f462ba9029d41aadf8ec93f2f99c5305deada ] 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 a3b02f090bba..474044072baf 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -455,7 +455,7 @@ static int nr_create(struct net *net, struct socket *sock, int protocol,
nr->t1 =
msecs_to_jiffies(READ_ONCE(sysctl_netrom_transport_timeout));
nr->t2 =
- msecs_to_jiffies(sysctl_netrom_transport_acknowledge_delay);
+ msecs_to_jiffies(READ_ONCE(sysctl_netrom_transport_acknowledge_delay));
nr->n2 =
msecs_to_jiffies(READ_ONCE(sysctl_netrom_transport_maximum_tries));
nr->t4 =