net: add missing data-race annotation for sk_ll_usec
authorEric Dumazet <edumazet@google.com>
Fri, 28 Jul 2023 15:03:17 +0000 (15:03 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 29 Jul 2023 17:13:41 +0000 (18:13 +0100)
In a prior commit I forgot that sk_getsockopt() reads
sk->sk_ll_usec without holding a lock.

Fixes: 0dbffbb5335a ("net: annotate data race around sk_ll_usec")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/sock.c

index d57acaee42d4b1204d34baf6f8ab64cd5a0c3abf..f11e19c7edfb46475b32cee3d1af1df45442f40c 100644 (file)
@@ -1900,7 +1900,7 @@ int sk_getsockopt(struct sock *sk, int level, int optname,
 
 #ifdef CONFIG_NET_RX_BUSY_POLL
        case SO_BUSY_POLL:
-               v.val = sk->sk_ll_usec;
+               v.val = READ_ONCE(sk->sk_ll_usec);
                break;
        case SO_PREFER_BUSY_POLL:
                v.val = READ_ONCE(sk->sk_prefer_busy_poll);