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

!7859 [sync] PR-7846: netrom: Fix a data-race around sysctl_netrom_transport_timeout 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/7846 
 
PR sync from: Hui Tang <tanghui20@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/CWSDHSQS2674I57I7YQD5SKKNS2LAQE2/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9Q95M 
 
Link:https://gitee.com/openeuler/kernel/pulls/7859

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents e8e5a147 8c91352e

net/netrom/af_netrom.c

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