From nobody Fri Sep 25 02:13:02 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8E3834519A4; Thu, 17 Sep 2026 13:41:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789652487; cv=none; b=BPJWF+A5S+FuYfeV4p7oeByT8etDrbgVoLaBqF7tOfonjarVlohF3M3HM6PdRz6UlscproT6CEfzpXhp+TIbFw0+X9I+FYaFybTCaboU5H8wZr78Zt1MRbtbEG51a0uxnIKY2U/1gPIfsjiGh22MyN+e9WsFP0WsPMJieuSB8Jw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789652487; c=relaxed/simple; bh=aCTCTf1hJkbyK1McE/Xr9U+luipp7i7g69aeirSJt1g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HFhuzus7rkblJz1TfcHZCBnEAngs1v5jmUDo0PrsfjbfuJ/6O5p/RgUZuHu6JyMMnOCfY/yPZ7smXHQG3tFbx8xaofQMgqZJResUtKzvXe9Jf5Q67uc8In1Xm61kN7bmFoSfcYYEZqV2ZntsxoaBwBZrCZ2MFcnW3IUm/PVvAW0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=IMKJQHv6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="IMKJQHv6" Received: by smtp.kernel.org (Postfix) with ESMTPS id 3E837C2BCB9; Thu, 17 Sep 2026 13:41:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1789652486; bh=aCTCTf1hJkbyK1McE/Xr9U+luipp7i7g69aeirSJt1g=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=IMKJQHv6AkZSP459LFZfVwcQQSC1iFijhzk9pD42id1kUUtTTOIIcpVp9n1/hPnBr jCoji1GR1uxPrjhzRF2Upo/yDEAs0i98d1UtA9m2nHd48uVyo8L9VHMNhQ3VH39jSI BkOlzzpTw4c++FWr48GJytatYAEvCYtz2NMyBZsrUECAvTL1eZr86Ull1AS4v+WQX7 EcjRQRnPNO52CNQ6wMaIdttavuzZJPpZe7qQJ9A5/81C9lGNFWb21rJCSJ+u9BnomN 0cUHgt5yo1mVyoYtkjpdbofSLuglWPKR46GhvzriCz2GFd0VSkOVdZtagMWSJOgmEG bO2jxsRMSO4aw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D98CC982D1; Thu, 17 Sep 2026 13:41:26 +0000 (UTC) From: Quanye Yang via B4 Relay Date: Thu, 17 Sep 2026 06:41:22 -0700 Subject: [PATCH net-next v4 1/2] tcp: annotate lockless access to sk->sk_err Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260917-mptcp-sk-err-net-v4-1-1f04f52f2561@proton.me> References: <20260917-mptcp-sk-err-net-v4-0-1f04f52f2561@proton.me> In-Reply-To: <20260917-mptcp-sk-err-net-v4-0-1f04f52f2561@proton.me> To: Eric Dumazet , Neal Cardwell , Kuniyuki Iwashima , "David S. Miller" , Jakub Kicinski , Paolo Abeni , Simon Horman , "Matthieu Baerts (NGI0)" , Geliang Tang , Mat Martineau , Jiayuan Chen Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1789652484; l=5666; i=quanyeyang@proton.me; s=20260801; h=from:subject:message-id; bh=Ix5sfC38WPodAhwSsSWFlgULEhsUjMU6HvhZTqKvtI4=; b=XICKJEvnlVPQ+97Fkk7kzz2TXOIPC0u4SU70VxENFCg9mTMdpbvoYsgF5FrOno8iFMsUYDete ake6vNE06oVCZbStYS6bvYYM7bmUiWViNwMOvz5XsIi+QmJ4ddWptgV X-Developer-Key: i=quanyeyang@proton.me; a=ed25519; pk=9L9FrcvzMgxPaBRU6XV0EnqTgjDqVO596rQKSZ9qZoY= X-Endpoint-Received: by B4 Relay for quanyeyang@proton.me/20260801 with auth_id=963 X-Original-From: Quanye Yang Reply-To: quanyeyang@proton.me From: Quanye Yang BUG: KCSAN: data-race in do_recvmmsg / mptcp_recvmsg read-write (marked) to 0xffff8880134d391c of 4 bytes by task 2619 on cpu 1: instrument_atomic_read_write include/linux/instrumented.h:113 [inline] sock_error include/net/sock.h:2565 [inline] do_recvmmsg+0x50c/0x580 net/socket.c:3049 __sys_recvmmsg net/socket.c:3144 [inline] __do_sys_recvmmsg net/socket.c:3167 [inline] __se_sys_recvmmsg net/socket.c:3160 [inline] __x64_sys_recvmmsg+0x161/0x180 net/socket.c:3160 x64_sys_call+0x19c7/0x1ca0 arch/x86/include/generated/asm/syscalls_64.h:300 do_syscall_x64 arch/x86/entry/syscall_64.c:61 [inline] do_syscall_64+0xde/0x3d0 arch/x86/entry/syscall_64.c:84 entry_SYSCALL_64_after_hwframe+0x77/0x7f read to 0xffff8880134d391c of 4 bytes by task 2620 on cpu 0: tcp_recv_should_stop include/net/tcp.h:3086 [inline] mptcp_recvmsg+0x54d/0xd50 net/mptcp/protocol.c:2466 inet_recvmsg+0x204/0x210 net/ipv4/af_inet.c:894 sock_recvmsg_nosec net/socket.c:1151 [inline] sock_recvmsg+0x11a/0x140 net/socket.c:1173 ____sys_recvmsg+0x14b/0x3c0 net/socket.c:2933 ___sys_recvmsg+0x116/0x160 net/socket.c:2975 __sys_recvmsg net/socket.c:3008 [inline] __do_sys_recvmsg net/socket.c:3014 [inline] __se_sys_recvmsg net/socket.c:3011 [inline] __x64_sys_recvmsg+0xeb/0x160 net/socket.c:3011 x64_sys_call+0x1319/0x1ca0 arch/x86/include/generated/asm/syscalls_64.h:48 do_syscall_x64 arch/x86/entry/syscall_64.c:61 [inline] do_syscall_64+0xde/0x3d0 arch/x86/entry/syscall_64.c:84 entry_SYSCALL_64_after_hwframe+0x77/0x7f value changed: 0x0000006b -> 0x00000000 Reported by Kernel Concurrency Sanitizer on: CPU: 0 UID: 0 PID: 2620 Comm: syz.2.33 Not tainted 7.2.0-g39d4f32c5d53 #76 = PREEMPT(full) Hardware name: QEMU Ubuntu 26.04 PC (i440FX + PIIX, 1996), BIOS 1.17.0-debi= an-1.17.0-1ubuntu1 04/01/2014 do_recvmmsg() and getsockopt(SO_ERROR) call sock_error() without the socket lock. sock_error() clears sk_err with xchg(), which races with unmarked loads of the same field. KCSAN reported the unmarked peek in tcp_recv_should_stop(). The same lockless writer races with the other plain sk_err reads on the TCP send, recv and splice paths. Annotate those peeks with READ_ONCE(). No extra ordering is needed: the value is only used to decide whether I/O should stop. This does not consume sk_err; the check-then-sock_error() TOCTOU on the no-data paths is a separate issue. MPTCP peeks are handled in the next patch. Suggested-by: Jiayuan Chen Link: https://lore.kernel.org/netdev/8bbee583-6f21-4817-bfeb-2d60057380a3@l= inux.dev/ Reported-by: Matthieu Baerts (NGI0) Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/632 Signed-off-by: Quanye Yang --- include/net/tcp.h | 3 ++- net/core/stream.c | 2 +- net/ipv4/tcp.c | 6 +++--- net/ipv4/tcp_bpf.c | 7 +++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index 5e5f5f9b89a3..6ee513bdb503 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -3093,7 +3093,8 @@ enum skb_drop_reason tcp_inbound_hash(struct sock *sk, =20 static inline int tcp_recv_should_stop(struct sock *sk) { - return sk->sk_err || + /* sk_err can be cleared locklessly by sock_error(). */ + return READ_ONCE(sk->sk_err) || sk->sk_state =3D=3D TCP_CLOSE || (sk->sk_shutdown & RCV_SHUTDOWN) || signal_pending(current); diff --git a/net/core/stream.c b/net/core/stream.c index 2d748581862d..5c0adc3077f0 100644 --- a/net/core/stream.c +++ b/net/core/stream.c @@ -133,7 +133,7 @@ int sk_stream_wait_memory(struct sock *sk, long *timeo_= p) while (1) { sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk); =20 - if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN)) + if (READ_ONCE(sk->sk_err) || (sk->sk_shutdown & SEND_SHUTDOWN)) goto do_error; if (!*timeo_p) goto do_eagain; diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 1c867a302444..9e7fa7e39726 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -843,7 +843,7 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *pp= os, break; if (sock_flag(sk, SOCK_DONE)) break; - if (sk->sk_err) { + if (READ_ONCE(sk->sk_err)) { ret =3D sock_error(sk); break; } @@ -1228,7 +1228,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr= *msg, size_t size) mss_now =3D tcp_send_mss(sk, &size_goal, flags); =20 err =3D -EPIPE; - if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN)) + if (READ_ONCE(sk->sk_err) || (sk->sk_shutdown & SEND_SHUTDOWN)) goto do_error; =20 while (msg_data_left(msg)) { @@ -2760,7 +2760,7 @@ static int tcp_recvmsg_locked(struct sock *sk, struct= msghdr *msg, size_t len, if (sock_flag(sk, SOCK_DONE)) break; =20 - if (sk->sk_err) { + if (READ_ONCE(sk->sk_err)) { copied =3D sock_error(sk); break; } diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c index 2e234d155b5e..a96323e65758 100644 --- a/net/ipv4/tcp_bpf.c +++ b/net/ipv4/tcp_bpf.c @@ -286,7 +286,7 @@ static int tcp_bpf_recvmsg_parser(struct sock *sk, if (sock_flag(sk, SOCK_DONE)) goto out; =20 - if (sk->sk_err) { + if (READ_ONCE(sk->sk_err)) { copied =3D sock_error(sk); goto out; } @@ -553,10 +553,9 @@ static int tcp_bpf_sendmsg(struct sock *sk, struct msg= hdr *msg, size_t size) bool enospc =3D false; u32 copy, osize; =20 - if (sk->sk_err) { - err =3D -sk->sk_err; + err =3D -READ_ONCE(sk->sk_err); + if (err) goto out_err; - } =20 copy =3D msg_data_left(msg); if (!sk_stream_memory_free(sk)) --=20 2.55.0 From nobody Fri Sep 25 02:13:02 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8E2554078CE; Thu, 17 Sep 2026 13:41:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789652487; cv=none; b=q/dFiz+Q7zGZXggwapdUfrBIzHW6bNunp9Ohv00OsQEpTSNeveIBTfjuLs2/nfQ8JvcoeS9z1AmmVhV/zYkqK5r/6tFYOq13EAle2dON6J9/6NFg4yy4uYluJeK4d5FpNdEXw3ftbhWaqcjzcH8gSehklaPXb5eLNyggAy1XCfQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789652487; c=relaxed/simple; bh=mF6rcqBtOeLeVkcwXS0sy4loi2sc24GJZU+mbMvw6JA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=m/u5CCnDDYFLR8iFZZM44iGywTaD/O2Lm6alnse0LmJxc7+ug4fW6k/vDjIGhUrL4WcCUzXGTMUuADFzDr0/7Ue5D6lg0BVZuPeWc0YhLBRhXv1UFTTiNjqH9stPNgj82r3cpOmEnuN6jip64M95K+hTbGq+PwDVgA9lK3swpoI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mHKbBXzr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mHKbBXzr" Received: by smtp.kernel.org (Postfix) with ESMTPS id 49D87C2BCFB; Thu, 17 Sep 2026 13:41:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1789652486; bh=mF6rcqBtOeLeVkcwXS0sy4loi2sc24GJZU+mbMvw6JA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=mHKbBXzrgpLLcDXj8fhj6NyNwbZuGP790tj32VPsdQsGPx2sLMVUL6TNK+9sQpgnZ /OM+8PjpchXQr4+m8C12Tqlxm7B8sDAQhW6R+cAcFqU+KU2tMxyX7oOzTsV3+lSQw2 ZOIghMh+vfh7ozZGyib08t9aXzudsV4wxAS+raCE1e5yn6ldIwDuwSlrXHEWPEkJQC r7WB6IEgiPrryT4rWRXvFIv2q1qfbCPE0EMbQs+ASTw6FpctvjsX7vKDkJi593AT3v kzGT+Knnhrv4tFaGslK/so+4Zd1aE4sr3CH2COwq4e2Yenzk1TDh9R6TAoEkEs1fd7 k+8ojZC8KdmnA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F4E5C982D5; Thu, 17 Sep 2026 13:41:26 +0000 (UTC) From: Quanye Yang via B4 Relay Date: Thu, 17 Sep 2026 06:41:23 -0700 Subject: [PATCH net-next v4 2/2] mptcp: annotate lockless access to sk->sk_err Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260917-mptcp-sk-err-net-v4-2-1f04f52f2561@proton.me> References: <20260917-mptcp-sk-err-net-v4-0-1f04f52f2561@proton.me> In-Reply-To: <20260917-mptcp-sk-err-net-v4-0-1f04f52f2561@proton.me> To: Eric Dumazet , Neal Cardwell , Kuniyuki Iwashima , "David S. Miller" , Jakub Kicinski , Paolo Abeni , Simon Horman , "Matthieu Baerts (NGI0)" , Geliang Tang , Mat Martineau , Jiayuan Chen Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1789652484; l=2705; i=quanyeyang@proton.me; s=20260801; h=from:subject:message-id; bh=ihY4XRH9RMhjOfpeeT8tP21amLumdct00zIA9m8+V+0=; b=aVmi+5F/8xiss5rWi3toBzgrunkk83nLr2KlK9bCozxOF/I0HOGOHLYCcS31Cmj8ypY5PZdpX PMwW+Qzqs6mDMbvOaz+KlBtStYkgNFM/Rgb851whA+mkCgBJtLLcWzl X-Developer-Key: i=quanyeyang@proton.me; a=ed25519; pk=9L9FrcvzMgxPaBRU6XV0EnqTgjDqVO596rQKSZ9qZoY= X-Endpoint-Received: by B4 Relay for quanyeyang@proton.me/20260801 with auth_id=963 X-Original-From: Quanye Yang Reply-To: quanyeyang@proton.me From: Quanye Yang sock_error() can clear sk_err with xchg() without the socket lock. Annotate the remaining MPTCP peeks on the msk send/recv/splice paths and on the subflow error-report path with READ_ONCE(). This does not consume sk_err; the check-then-sock_error() TOCTOU on the no-data paths is a separate issue. Signed-off-by: Quanye Yang Reviewed-by: Matthieu Baerts (NGI0) --- net/mptcp/protocol.c | 8 ++++---- net/mptcp/subflow.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index e1f08f71cdb1..91637d1ed070 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -969,7 +969,7 @@ static bool move_skbs_to_msk(struct mptcp_sock *msk, st= ruct sock *ssk) =20 moved =3D __mptcp_move_skbs_from_subflow(msk, ssk, true); __mptcp_ofo_queue(msk); - if (unlikely(ssk->sk_err)) + if (unlikely(READ_ONCE(ssk->sk_err))) __mptcp_subflow_error_report(sk, ssk); =20 /* If the moves have caught up with the DATA_FIN sequence number @@ -2028,7 +2028,7 @@ static int mptcp_sendmsg(struct sock *sk, struct msgh= dr *msg, size_t len) } =20 ret =3D -EPIPE; - if (unlikely(sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN))) + if (unlikely(READ_ONCE(sk->sk_err) || (sk->sk_shutdown & SEND_SHUTDOWN))) goto do_error; =20 pfrag =3D sk_page_frag(sk); @@ -2429,7 +2429,7 @@ static int mptcp_recvmsg(struct sock *sk, struct msgh= dr *msg, size_t len, !timeo) break; } else { - if (sk->sk_err) { + if (READ_ONCE(sk->sk_err)) { copied =3D sock_error(sk); break; } @@ -4655,7 +4655,7 @@ static ssize_t mptcp_splice_read(struct socket *sock,= loff_t *ppos, break; if (sock_flag(sk, SOCK_DONE)) break; - if (sk->sk_err) { + if (READ_ONCE(sk->sk_err)) { ret =3D sock_error(sk); break; } diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index af81ad5e699d..ec9668fe8d5b 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1541,7 +1541,7 @@ static void subflow_data_ready(struct sock *sk) if (mptcp_data_avail(msk) < parent->sk_rcvlowat && (tcp_sk(sk)->rcv_nxt - tcp_sk(sk)->rcv_wup) > inet_csk(sk)->icsk_ack= .rcv_mss) inet_csk(sk)->icsk_ack.pending |=3D ICSK_ACK_NOW; - } else if (unlikely(sk->sk_err)) { + } else if (unlikely(READ_ONCE(sk->sk_err))) { subflow_error_report(sk); } } @@ -1889,7 +1889,7 @@ static void subflow_state_change(struct sock *sk) */ if (mptcp_subflow_data_available(sk)) mptcp_data_ready(parent, sk); - else if (unlikely(sk->sk_err)) + else if (unlikely(READ_ONCE(sk->sk_err))) subflow_error_report(sk); =20 subflow_sched_work_if_closed(mptcp_sk(parent), sk); --=20 2.55.0