Skip to content

Commit eee0a44

Browse files
edumazetsmb49
authored andcommitted
net: add missing data-race annotation for sk_ll_usec
BugLink: https://bugs.launchpad.net/bugs/2038236 [ Upstream commit e5f0d2d ] In a prior commit I forgot that sk_getsockopt() reads sk->sk_ll_usec without holding a lock. Fixes: 0dbffbb ("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> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent 982f37b commit eee0a44

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

net/core/sock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1853,7 +1853,7 @@ int sk_getsockopt(struct sock *sk, int level, int optname,
18531853

18541854
#ifdef CONFIG_NET_RX_BUSY_POLL
18551855
case SO_BUSY_POLL:
1856-
v.val = sk->sk_ll_usec;
1856+
v.val = READ_ONCE(sk->sk_ll_usec);
18571857
break;
18581858
case SO_PREFER_BUSY_POLL:
18591859
v.val = READ_ONCE(sk->sk_prefer_busy_poll);

0 commit comments

Comments
 (0)