]> xenbits.xensource.com Git - people/aperard/linux.git/commitdiff
netrom: Fix a data-race around sysctl_netrom_transport_timeout
authorJason Xing <kernelxing@tencent.com>
Mon, 4 Mar 2024 08:20:38 +0000 (16:20 +0800)
committerSasha Levin <sashal@kernel.org>
Fri, 15 Mar 2024 14:48:16 +0000 (10:48 -0400)
[ 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>
net/netrom/af_netrom.c

index ec5747969f964623802b4aa0e59bab5428ebb91f..3c6567af2ba4701cd665f11edc359a194b94f2bc 100644 (file)
@@ -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     =