]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: add missing READ_ONCE(sk->sk_rcvlowat) annotation
authorEric Dumazet <edumazet@google.com>
Fri, 28 Jul 2023 15:03:11 +0000 (15:03 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 11 Aug 2023 13:13:51 +0000 (15:13 +0200)
[ Upstream commit e6d12bdb435d23ff6c1890c852d85408a2f496ee ]

In a prior commit, I forgot to change sk_getsockopt()
when reading sk->sk_rcvlowat locklessly.

Fixes: eac66402d1c3 ("net: annotate sk->sk_rcvlowat lockless reads")
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>
net/core/sock.c

index d392efa0d95516fad1cddf07deba3b385d94880a..ffd566d52eec397681ff672ba170ca8629e29450 100644 (file)
@@ -1549,7 +1549,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
                break;
 
        case SO_RCVLOWAT:
-               v.val = sk->sk_rcvlowat;
+               v.val = READ_ONCE(sk->sk_rcvlowat);
                break;
 
        case SO_SNDLOWAT: