From mboxrd@z Thu Jan 1 00:00:00 1970 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 B904454758; Mon, 1 Dec 2025 10:45: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=1764585927; cv=none; b=sIclgWQ5GJkSQra8rVGDWTX3fz2U5R2l0fF4mdUIK0PoQyS8zcmmEGgSSc6Wub3bbNJB5PbsPv1NATWKpNU5lnT8IcZjubYuTzrPX2QwL5OGCdIw9CoUTjTeHPrkv4AzJXO5ThcSWCKJcFXFru/M1viG+W80jXNhX6vbO5kN9wc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764585927; c=relaxed/simple; bh=tJyo7gfYI+FgioDj9QKP4ajZM4JWwtGglgEgxzY/1Ss=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sUOauR8fLcsF0AJAltkRHAGBzmrkVOukaky1AvOYvHD1cTl7DhFxF3cVXJyl0ROGeFhFBrzUecI1hpG5Ks64oO/eqWRfrVW463f295MIxjw15/IBV0Orr+ElOf9QxqJsnMlyaWM/6/vhbdhD6dAOmna6yJZLElLOqQ3nG5EBkvA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZJS8xPmy; 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="ZJS8xPmy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2C1DC4CEF1; Mon, 1 Dec 2025 10:45:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1764585927; bh=tJyo7gfYI+FgioDj9QKP4ajZM4JWwtGglgEgxzY/1Ss=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZJS8xPmyBaL/ciXXBCSt4kbH/Y2zuTvaTGmj0iZAY9EOkNTOPxXIvvbljioJcgC/z i5EN6NG1yHjrPSzZYxjjEwQW5gutvTdgjAGAlAZjfpmTvCNByfArxSimR5xJ9armHe Xzk8Arw5OUiZ97OKhcI36vKYzBb3Ay/myAJ7bycxF/3h9vSFHW/zF8GdJvseqZGPTA ZVVsDCFHMgIeFKvm9mO2P/QSHK9mL77vv6GZQ88w031ikW4klvqfFHOKrYEkQ2ENod qt8dXAwu8KPKiQcmipdxI6n5oxlTtpKVDsI7NCYRLcC8EMhrRRaHcSeOtRwVdcnvL0 /XAvW0uJ/mXZA== From: "Matthieu Baerts (NGI0)" To: stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: MPTCP Upstream , Jiayuan Chen , Martin KaFai Lau , Jakub Sitnicki , "Matthieu Baerts (NGI0)" Subject: [PATCH 6.1.y] mptcp: Fix proto fallback detection with BPF Date: Mon, 1 Dec 2025 11:45:00 +0100 Message-ID: <20251201104459.3440448-2-matttbe@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2025112444-entangled-winking-ac86@gregkh> References: <2025112444-entangled-winking-ac86@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3965; i=matttbe@kernel.org; h=from:subject; bh=0gQtl2gQHsNhAn3xYU+lLidGr+ccGvclUwetC+YrmTQ=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDJ1C9dMKGe4oxi57vgPo19WnyZ8Udztt8lA9VecVKytw vqPZ9nFO0pZGMS4GGTFFFmk2yLzZz6v4i3x8rOAmcPKBDKEgYtTACbS483wv+Lz66irZ+dMn3et 5YV8u+2FT3F7Q9cf8FJmrGZwEjz05wEjw2P98LK849F+163+BD8/8F7jw8Lsm9t2eWk9lLNSN39 czAEA X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: 8bit From: Jiayuan Chen commit c77b3b79a92e3345aa1ee296180d1af4e7031f8f upstream. The sockmap feature allows bpf syscall from userspace, or based on bpf sockops, replacing the sk_prot of sockets during protocol stack processing with sockmap's custom read/write interfaces. ''' tcp_rcv_state_process() syn_recv_sock()/subflow_syn_recv_sock() tcp_init_transfer(BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB) bpf_skops_established <== sockops bpf_sock_map_update(sk) <== call bpf helper tcp_bpf_update_proto() <== update sk_prot ''' When the server has MPTCP enabled but the client sends a TCP SYN without MPTCP, subflow_syn_recv_sock() performs a fallback on the subflow, replacing the subflow sk's sk_prot with the native sk_prot. ''' subflow_syn_recv_sock() subflow_ulp_fallback() subflow_drop_ctx() mptcp_subflow_ops_undo_override() ''' Then, this subflow can be normally used by sockmap, which replaces the native sk_prot with sockmap's custom sk_prot. The issue occurs when the user executes accept::mptcp_stream_accept::mptcp_fallback_tcp_ops(). Here, it uses sk->sk_prot to compare with the native sk_prot, but this is incorrect when sockmap is used, as we may incorrectly set sk->sk_socket->ops. This fix uses the more generic sk_family for the comparison instead. Additionally, this also prevents a WARNING from occurring: result from ./scripts/decode_stacktrace.sh: ------------[ cut here ]------------ WARNING: CPU: 0 PID: 337 at net/mptcp/protocol.c:68 mptcp_stream_accept \ (net/mptcp/protocol.c:4005) Modules linked in: ... PKRU: 55555554 Call Trace: do_accept (net/socket.c:1989) __sys_accept4 (net/socket.c:2028 net/socket.c:2057) __x64_sys_accept (net/socket.c:2067) x64_sys_call (arch/x86/entry/syscall_64.c:41) do_syscall_64 (arch/x86/entry/syscall_64.c:63 arch/x86/entry/syscall_64.c:94) entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:130) RIP: 0033:0x7f87ac92b83d ---[ end trace 0000000000000000 ]--- Fixes: 0b4f33def7bb ("mptcp: fix tcp fallback crash") Signed-off-by: Jiayuan Chen Signed-off-by: Martin KaFai Lau Reviewed-by: Jakub Sitnicki Reviewed-by: Matthieu Baerts (NGI0) Cc: Link: https://patch.msgid.link/20251111060307.194196-3-jiayuan.chen@linux.dev [ Conflicts in protocol.c, because commit 8e2b8a9fa512 ("mptcp: don't overwrite sock_ops in mptcp_is_tcpsk()") is not in this version. It changes the logic on how and where the sock_ops is overridden in case of passive fallback. To fix this, mptcp_is_tcpsk() is modified to use the family, but first, a check of the protocol is required to continue returning 'false' in case of MPTCP socket. ] Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/protocol.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index e2908add97d3..10844f08752c 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -79,8 +79,13 @@ static u64 mptcp_wnd_end(const struct mptcp_sock *msk) static bool mptcp_is_tcpsk(struct sock *sk) { struct socket *sock = sk->sk_socket; + unsigned short family; - if (unlikely(sk->sk_prot == &tcp_prot)) { + if (likely(sk->sk_protocol == IPPROTO_MPTCP)) + return false; + + family = READ_ONCE(sk->sk_family); + if (unlikely(family == AF_INET)) { /* we are being invoked after mptcp_accept() has * accepted a non-mp-capable flow: sk is a tcp_sk, * not an mptcp one. @@ -91,7 +96,7 @@ static bool mptcp_is_tcpsk(struct sock *sk) sock->ops = &inet_stream_ops; return true; #if IS_ENABLED(CONFIG_MPTCP_IPV6) - } else if (unlikely(sk->sk_prot == &tcpv6_prot)) { + } else if (unlikely(family == AF_INET6)) { sock->ops = &inet6_stream_ops; return true; #endif -- 2.51.0