diff options
| author | Eric Dumazet <edumazet@google.com> | 2023-07-28 18:03:17 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-11 12:57:49 +0300 |
| commit | 268b29ef1947718582936e5e6b3d851bafe19271 (patch) | |
| tree | f02300716cc7cc4641bf08b2bf5e7a89ddd0b2a7 | |
| parent | ad417bab9d5b0bb5d8c24423c8d80beb5858bd08 (diff) | |
| download | linux-268b29ef1947718582936e5e6b3d851bafe19271.tar.xz | |
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>
| -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 a241734b1024..98f4b4a80de4 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1547,7 +1547,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 |