moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

icmp: Fix data-races around sysctl_icmp_echo_enable_probe.

Browse Source 
[ Upstream commit 4a2f7083cc6cb72dade9a63699ca352fad26d1cd ]

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

Fixes: d329ea5bd8 ("icmp: add response to RFC 8335 PROBE messages")
Fixes: 1fd07f33c3 ("ipv6: ICMPV6: add response to ICMPV6 RFC 8335 PROBE messages")
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Kuniyuki Iwashima
2022-07-11 17:15:23 -07:00
committed by Greg Kroah-Hartman
parent a716a3846c
commit cce955efa0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/icmp.c
View File

@@ -1034,7 +1034,7 @@ bool icmp_build_probe(struct sk_buff *skb, struct icmphdr *icmphdr)
u16 ident_len; u16 ident_len;
u8 status; u8 status;
if (!net->ipv4.sysctl_icmp_echo_enable_probe) if (!READ_ONCE(net->ipv4.sysctl_icmp_echo_enable_probe))
return false; return false;
/* We currently only support probing interfaces on the proxy node /* We currently only support probing interfaces on the proxy node

2
net/ipv6/icmp.c
View File

@@ -927,7 +927,7 @@ static int icmpv6_rcv(struct sk_buff *skb)
break; break;
case ICMPV6_EXT_ECHO_REQUEST: case ICMPV6_EXT_ECHO_REQUEST:
if (!net->ipv6.sysctl.icmpv6_echo_ignore_all && if (!net->ipv6.sysctl.icmpv6_echo_ignore_all &&
net->ipv4.sysctl_icmp_echo_enable_probe) READ_ONCE(net->ipv4.sysctl_icmp_echo_enable_probe))
icmpv6_echo_reply(skb); icmpv6_echo_reply(skb);
break; break;