diff options
| author | David S. Miller <davem@davemloft.net> | 2022-07-13 12:56:50 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-07-13 12:56:50 +0100 |
| commit | 7d5424b26f17b74d94e73815718b424ad207a3e7 (patch) | |
| tree | a571db15de0e5ac08997aab9705356eff39685b6 /net/ipv6/icmp.c | |
| parent | 22b9c41a3fb8ef4624bcda312665937d2ba98aa7 (diff) | |
| parent | bdf00bf24bef9be1ca641a6390fd5487873e0d2e (diff) | |
Merge branch 'net-sysctl-races'
Kuniyuki Iwashima says:
====================
sysctl: Fix data-races around ipv4_net_table (Roun).
This series fixes data-races around the first 13 knobs and
nexthop_compat_mode in ipv4_net_table.
I will post another patch for three early_demux knobs later,
so the next round will start from ip_default_ttl.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/icmp.c')
| -rw-r--r-- | net/ipv6/icmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 61770220774e..9d92d51c4757 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -925,7 +925,7 @@ static int icmpv6_rcv(struct sk_buff *skb) break; case ICMPV6_EXT_ECHO_REQUEST: 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); break; |