From: Kuniyuki Iwashima kuniyu@amazon.com

mainline inclusion from mainline-v5.19-rc7 commit d2efabce81db7eed1c98fa1a3f203f0edd738ac3 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8MEXU CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...

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

While reading sysctl_icmp_errors_use_inbound_ifaddr, it can be changed concurrently. Thus, we need to add READ_ONCE() to its reader.

Fixes: 1c2fb7f93cb2 ("[IPV4]: Sysctl configurable icmp error source address.") Signed-off-by: Kuniyuki Iwashima kuniyu@amazon.com Signed-off-by: David S. Miller davem@davemloft.net

Conflicts: net/ipv4/sysctl_net_ipv4.c

Signed-off-by: Zhengchao Shao shaozhengchao@huawei.com --- net/ipv4/icmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index a4f838ec7c75..8a39b12611e1 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c @@ -710,7 +710,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)