Unverified Commit db8faa59 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7743 netrom: Fix data-races around sysctl_net_busy_read 

Merge Pull Request from: @ci-robot 
 
PR sync from: Hongbo Li <lihongbo22@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/PB2VFJ2WABB2KYLXGAJONEAWNNTMJYOV/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9Q94D 
 
Link:https://gitee.com/openeuler/kernel/pulls/7743

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 83980813 6710cc9d

net/netrom/af_netrom.c

+1 −1
Original line number Diff line number Diff line
@@ -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

		 * as an extension of the protocol.

		 */

		if (sysctl_netrom_reset_circuit &&

		if (READ_ONCE(sysctl_netrom_reset_circuit) &&

		    (frametype != NR_RESET || flags != 0))

			nr_transmit_reset(skb, 1);

net/netrom/nr_in.c

+3 −3
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static int nr_state1_machine(struct sock *sk, struct sk_buff *skb, 
		break;



	case NR_RESET:

		if (sysctl_netrom_reset_circuit)

		if (READ_ONCE(sysctl_netrom_reset_circuit))

			nr_disconnect(sk, ECONNRESET);

		break;
@@ -128,7 +128,7 @@ static int nr_state2_machine(struct sock *sk, struct sk_buff *skb, 
		break;



	case NR_RESET:

		if (sysctl_netrom_reset_circuit)

		if (READ_ONCE(sysctl_netrom_reset_circuit))

			nr_disconnect(sk, ECONNRESET);

		break;
@@ -263,7 +263,7 @@ static int nr_state3_machine(struct sock *sk, struct sk_buff *skb, int frametype 
		break;



	case NR_RESET:

		if (sysctl_netrom_reset_circuit)

		if (READ_ONCE(sysctl_netrom_reset_circuit))

			nr_disconnect(sk, ECONNRESET);

		break;