diff options
| author | Eric Dumazet <edumazet@google.com> | 2023-07-28 15:03:17 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-11 11:45:37 +0200 |
| commit | 2649ce3bc0e7d638b179cff1d97054e4066f0ae2 (patch) | |
| tree | f8f25e1a6a9e54b07694eaf69bb30325310e22f3 /net/core | |
| parent | 4ab9844e48a95ee8042352dc35cf65e5eb7699d1 (diff) | |
| download | linux-stable-2649ce3bc0e7d638b179cff1d97054e4066f0ae2.tar.gz linux-stable-2649ce3bc0e7d638b179cff1d97054e4066f0ae2.tar.bz2 linux-stable-2649ce3bc0e7d638b179cff1d97054e4066f0ae2.zip | |
net: add missing data-race annotation for sk_ll_usec
[ Upstream commit e5f0d2dd3c2faa671711dac6d3ff3cef307bcfe3 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index f112862fe068..3e6da3694a5a 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1349,7 +1349,7 @@ int sock_getsockopt(struct socket *sock, 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; #endif |