diff options
| author | David S. Miller <davem@davemloft.net> | 2023-12-11 10:59:17 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-12-11 10:59:17 +0000 |
| commit | 70028b2e51c61d8dda0a31985978f4745da6a11b (patch) | |
| tree | 34623c8c03fc41bcf60cea58e0db4a8bb4ea7f35 /net/ipv6/tcp_ipv6.c | |
| parent | 9a64d4c93eee6b2efb7a02ec98d9480946424509 (diff) | |
| parent | 1ac13efd614c752d3b47bbfb58e7c36eeb92cb5a (diff) | |
Merge branch 'ipv6-data-races'
Eric Dumazet says:
====================
ipv6: more data-race annotations
Small follow up series, taking care of races around
np->mcast_oif and np->ucast_oif.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 06a19fe2afd1..d1307d77a6f0 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -1702,7 +1702,7 @@ ipv6_pktoptions: if (TCP_SKB_CB(opt_skb)->end_seq == tp->rcv_nxt && !((1 << sk->sk_state) & (TCPF_CLOSE | TCPF_LISTEN))) { if (np->rxopt.bits.rxinfo || np->rxopt.bits.rxoinfo) - np->mcast_oif = tcp_v6_iif(opt_skb); + WRITE_ONCE(np->mcast_oif, tcp_v6_iif(opt_skb)); if (np->rxopt.bits.rxhlim || np->rxopt.bits.rxohlim) WRITE_ONCE(np->mcast_hops, ipv6_hdr(opt_skb)->hop_limit); |