aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorGravatar Eric Dumazet <edumazet@google.com> 2023-07-28 15:03:17 +0000
committerGravatar David S. Miller <davem@davemloft.net> 2023-07-29 18:13:41 +0100
commite5f0d2dd3c2faa671711dac6d3ff3cef307bcfe3 (patch)
treec5116a8a5d66da42c4591c8e7c9b60a38a320fa2 /net
parentnet: add missing data-race annotations around sk->sk_peek_off (diff)
downloadlinux-e5f0d2dd3c2faa671711dac6d3ff3cef307bcfe3.tar.gz
linux-e5f0d2dd3c2faa671711dac6d3ff3cef307bcfe3.tar.bz2
linux-e5f0d2dd3c2faa671711dac6d3ff3cef307bcfe3.zip
net: add missing data-race annotation for sk_ll_usec
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>
Diffstat (limited to 'net')
-rw-r--r--net/core/sock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c
index d57acaee42d4..f11e19c7edfb 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -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);