Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

netrom: Fix data-races around sysctl_net_busy_read

Browse source 
[ Upstream commit d380ce70058a4ccddc3e5f5c2063165dc07672c6 ]

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>
This commit is contained in:
Jason Xing 2024-03-04 16:20:46 +08:00 • committed by Ksawlii
parent 17a3bff930
commit 545714e99b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/netrom/af_netrom.c
View file

@ -954,7 +954,7 @@ int nr_rx_frame(struct sk_buff *skb, struct net_device *dev)
* G8PZT's Xrouter which is sending packets with command type 7 * G8PZT's Xrouter which is sending packets with command type 7
* as an extension of the protocol. * as an extension of the protocol.
*/ */
if (sysctl_netrom_reset_circuit && if (READ_ONCE(sysctl_netrom_reset_circuit) &&
(frametype != NR_RESET || flags != 0)) (frametype != NR_RESET || flags != 0))
nr_transmit_reset(skb, 1); nr_transmit_reset(skb, 1);

6
net/netrom/nr_in.c
View file

@ -97,7 +97,7 @@ static int nr_state1_machine(struct sock *sk, struct sk_buff *skb,
break; break;
case NR_RESET: case NR_RESET:
if (sysctl_netrom_reset_circuit) if (READ_ONCE(sysctl_netrom_reset_circuit))
nr_disconnect(sk, ECONNRESET); nr_disconnect(sk, ECONNRESET);
break; break;
@ -128,7 +128,7 @@ static int nr_state2_machine(struct sock *sk, struct sk_buff *skb,
break; break;
case NR_RESET: case NR_RESET:
if (sysctl_netrom_reset_circuit) if (READ_ONCE(sysctl_netrom_reset_circuit))
nr_disconnect(sk, ECONNRESET); nr_disconnect(sk, ECONNRESET);
break; break;
@ -263,7 +263,7 @@ static int nr_state3_machine(struct sock *sk, struct sk_buff *skb, int frametype
break; break;
case NR_RESET: case NR_RESET:
if (sysctl_netrom_reset_circuit) if (READ_ONCE(sysctl_netrom_reset_circuit))
nr_disconnect(sk, ECONNRESET); nr_disconnect(sk, ECONNRESET);
break; break;