]> xenbits.xensource.com Git - people/aperard/linux.git/commitdiff
mptcp: annotate a data-race around sysctl_tcp_wmem[0]
authorJason Xing <kernelxing@tencent.com>
Fri, 8 Mar 2024 11:25:03 +0000 (19:25 +0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 11 Mar 2024 10:37:40 +0000 (10:37 +0000)
It's possible that writer and the reader can manipulate the same
sysctl knob concurrently. Using READ_ONCE() to prevent reading
an old value.

Signed-off-by: Jason Xing <kernelxing@tencent.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/mptcp/protocol.h

index f16edef6026a3b7f919fd14c09440854f6c0e602..a10ebf3ee10a1e06ecf0ca461c72c98163d8ff45 100644 (file)
@@ -850,7 +850,7 @@ static inline void __mptcp_sync_sndbuf(struct sock *sk)
        if (sk->sk_userlocks & SOCK_SNDBUF_LOCK)
                return;
 
-       new_sndbuf = sock_net(sk)->ipv4.sysctl_tcp_wmem[0];
+       new_sndbuf = READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_wmem[0]);
        mptcp_for_each_subflow(mptcp_sk(sk), subflow) {
                ssk_sndbuf =  READ_ONCE(mptcp_subflow_tcp_sock(subflow)->sk_sndbuf);