Commit 1593f440 authored by Jason Xing's avatar Jason Xing Committed by Ma Wupeng
Browse files

netrom: Fix a data-race around sysctl_netrom_transport_no_activity_timeout 

stable inclusion
from stable-v6.6.22
commit 2309b369fae2d9cdc3c945cd3eaec84eb1958ca3
bugzilla: https://gitee.com/openeuler/kernel/issues/I99TJK

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2309b369fae2d9cdc3c945cd3eaec84eb1958ca3



--------------------------------

[ Upstream commit f99b494b40431f0ca416859f2345746199398e2b ]

We need to protect the reader reading the sysctl value because the
value can be changed concurrently.

Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Signed-off-by: default avatarJason Xing <kernelxing@tencent.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent 0d5033d9

net/netrom/af_netrom.c

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ static int nr_create(struct net *net, struct socket *sock, int protocol, 
	nr->t4     =

		msecs_to_jiffies(READ_ONCE(sysctl_netrom_transport_busy_delay));

	nr->idle   =

		msecs_to_jiffies(sysctl_netrom_transport_no_activity_timeout);

		msecs_to_jiffies(READ_ONCE(sysctl_netrom_transport_no_activity_timeout));

	nr->window = READ_ONCE(sysctl_netrom_transport_requested_window_size);



	nr->bpqext = 1;