diff options
| author | Eric Dumazet <edumazet@google.com> | 2023-12-08 10:12:44 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-12-11 10:59:17 +0000 |
| commit | 1ac13efd614c752d3b47bbfb58e7c36eeb92cb5a (patch) | |
| tree | 34623c8c03fc41bcf60cea58e0db4a8bb4ea7f35 /net/ipv6/icmp.c | |
| parent | d2f011a0bf28c090ad75c9b1d306f2e1dda1c9bc (diff) | |
| download | linux-1ac13efd614c752d3b47bbfb58e7c36eeb92cb5a.tar.gz linux-1ac13efd614c752d3b47bbfb58e7c36eeb92cb5a.tar.bz2 linux-1ac13efd614c752d3b47bbfb58e7c36eeb92cb5a.zip | |
ipv6: annotate data-races around np->ucast_oif
np->ucast_oif is read locklessly in some contexts.
Make all accesses to this field lockless, adding appropriate
annotations.
This also makes setsockopt( IPV6_UNICAST_IF ) lockless.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/icmp.c')
| -rw-r--r-- | net/ipv6/icmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index f84a465c9759..1635da07285f 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -586,7 +586,7 @@ void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info, if (!fl6.flowi6_oif && ipv6_addr_is_multicast(&fl6.daddr)) fl6.flowi6_oif = READ_ONCE(np->mcast_oif); else if (!fl6.flowi6_oif) - fl6.flowi6_oif = np->ucast_oif; + fl6.flowi6_oif = READ_ONCE(np->ucast_oif); ipcm6_init_sk(&ipc6, sk); ipc6.sockc.mark = mark; @@ -772,7 +772,7 @@ static enum skb_drop_reason icmpv6_echo_reply(struct sk_buff *skb) if (!fl6.flowi6_oif && ipv6_addr_is_multicast(&fl6.daddr)) fl6.flowi6_oif = READ_ONCE(np->mcast_oif); else if (!fl6.flowi6_oif) - fl6.flowi6_oif = np->ucast_oif; + fl6.flowi6_oif = READ_ONCE(np->ucast_oif); if (ip6_dst_lookup(net, sk, &dst, &fl6)) goto out; |