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

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

Fixes: ebb3b78db7bf ("tcp: annotate sk->sk_rcvbuf 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 0e480ac6c4de523ee5b512696a0b647676a8f911..59abfb2c922660a7bde9c95886409dddbf7e0c87 100644 (file)
@@ -1460,7 +1460,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
                break;
 
        case SO_RCVBUF:
-               v.val = sk->sk_rcvbuf;
+               v.val = READ_ONCE(sk->sk_rcvbuf);
                break;
 
        case SO_REUSEADDR: