diff options
| author | Eric Dumazet <edumazet@google.com> | 2023-12-08 10:12:43 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-12-11 10:59:17 +0000 |
| commit | d2f011a0bf28c090ad75c9b1d306f2e1dda1c9bc (patch) | |
| tree | 672849531d60dae088df5508f6183ea01231b6ae /net/ipv6/datagram.c | |
| parent | 9a64d4c93eee6b2efb7a02ec98d9480946424509 (diff) | |
| download | linux-d2f011a0bf28c090ad75c9b1d306f2e1dda1c9bc.tar.gz | |
ipv6: annotate data-races around np->mcast_oif
np->mcast_oif is read locklessly in some contexts.
Make all accesses to this field lockless, adding appropriate
annotations.
This also makes setsockopt( IPV6_MULTICAST_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/datagram.c')
| -rw-r--r-- | net/ipv6/datagram.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c index cc6a502db39d2..1804bd6f46840 100644 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c @@ -60,7 +60,7 @@ static void ip6_datagram_flow_key_init(struct flowi6 *fl6, if (!oif) { if (ipv6_addr_is_multicast(&fl6->daddr)) - oif = np->mcast_oif; + oif = READ_ONCE(np->mcast_oif); else oif = np->ucast_oif; } @@ -229,7 +229,7 @@ ipv4_connected: } if (!sk->sk_bound_dev_if && (addr_type & IPV6_ADDR_MULTICAST)) - WRITE_ONCE(sk->sk_bound_dev_if, np->mcast_oif); + WRITE_ONCE(sk->sk_bound_dev_if, READ_ONCE(np->mcast_oif)); /* Connect to link-local address requires an interface */ if (!sk->sk_bound_dev_if) { |