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:17 -0400
commit5deaef2bf56456c71b841e0dfde1bee2fd88c4eb (patch)
tree6cf4d44f51437374e51d39257d74aff47af5ebda
parentd28fa5f0e6c1554e2829f73a6a276c9a49689d04 (diff)
downloadlinux-stable-5deaef2bf56456c71b841e0dfde1bee2fd88c4eb.tar.gz
linux-stable-5deaef2bf56456c71b841e0dfde1bee2fd88c4eb.tar.bz2
linux-stable-5deaef2bf56456c71b841e0dfde1bee2fd88c4eb.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 be404ace9878..7428ea436e31 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 =