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

!3254 icmp: Fix a data-race around sysctl_icmp_errors_use_inbound_ifaddr. 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/4QUXVXHUASVSGVRIOF6PG3DBJ3RL7MJZ/ 
 
https://gitee.com/openeuler/kernel/issues/I8MEXU 
 
Link:https://gitee.com/openeuler/kernel/pulls/3254

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 59bb3d32 5de909a3

net/ipv4/icmp.c

+1 −1
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ void __icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info, 


		rcu_read_lock();

		if (rt_is_input_route(rt) &&

		    net->ipv4.sysctl_icmp_errors_use_inbound_ifaddr)

		    READ_ONCE(net->ipv4.sysctl_icmp_errors_use_inbound_ifaddr))

			dev = dev_get_by_index_rcu(net, inet_iif(skb_in));



		if (dev)

net/ipv4/sysctl_net_ipv4.c

+3 −1
Original line number Diff line number Diff line
@@ -613,7 +613,9 @@ static struct ctl_table ipv4_net_table[] = { 
		.data		= &init_net.ipv4.sysctl_icmp_errors_use_inbound_ifaddr,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

		.proc_handler	= proc_dointvec,

		.extra1		= SYSCTL_ZERO,

		.extra2		= SYSCTL_ONE

	},

	{

		.procname	= "icmp_ratelimit",