From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794050688; b=ZGXazPkqW+6r2JsmvIWYM6f8DvoObOxEZONrhm24RPiNVBEhspv+hSmJJBH65cF4bcBX 0tERN3HKMWP0pObgFjVdgeGXglSvEvg0Oq3B/VOzFUGp2WP6AfEJ/SgBXWyvWryvy/esb NOgXVwgo5kYxVsc3pMmF0cBkl2QFPpeoSZUnSiWhVYPpWQQl5YHPEicGPcCjiVxt5Gzt0 E97m8g+oxLSG4FP1xA6h6bQs8qkYZKpiZE7jws515EAB+RZZj9J/dlbf2VoLV8m5pWQq4 1QkLoOiijBAm7DB5b68Y1ID2BcBVQlf4WqfsB1IMtQSslnBa8JYpTK6NdOwjdPkCEsg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794050688; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=jBl2fXE86fmMTsago71noA0Ix0Nd3UqyXQ/KIaVrouc=; b=YuB4e68o+KASQAqq7rd5e+5W5+jHnIG1ZsSZb/GXtUrXmSjBbhBGFPMrAVTlHIQaCOJs ibE0w3APgytKwEJYoSDUR5qa7HxU+evRwZIhlSJNlT2smfJb+YkVWAQMoqpP8Adwjnx8O AA1pA1cZRnLZMvKElbNKOrXiBjRxODym3qBB9rM1ilzcyv7SviOUaWm4kt29ItHIgz36A UjJP2z9yK3LdDhD5sB76tf2zDLxdda6Nu7+SpIRlNkK6wA6ivQaOsj+QaCQ3w3Jh65lfj RR4nNOGkCQ9azVNuXE6aYEzsIo0pncwqi5nymkb+w5P/raqaDlUTWyj02HPCb/Eem3Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=WkKifAtg; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E1A15606A326 for ; Sat, 7 Nov 2026 11:24:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=WkKifAtg Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44A361F0089F; Sat, 7 Nov 2026 11:24:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794050687; bh=jBl2fXE86fmMTsago71noA0Ix0Nd3UqyXQ/KIaVrouc=; h=From:To:Cc:Subject:Date; b=WkKifAtgHVkDLnOhLstUzWNO6raeVIO/TsKbex4COG8Dv1dEatrrO0q89n4+2jV/r Fvl8Yjpr9gz1Nl1WTWLSa4QNjQOLunFOR/pCZRp4GHJvPyRafGnfFW3VEUoOZfMOCj NpOCe/HCmcg5/wMzlfOeeCki22w8mlMVibj3SYQs6oy7usdLUj66o37WvkX4zq8du/ uyxTazwAm/hiwMCiPB1SkjDia6cGMwIHJeeQD7w2Cy/TUWGg0wMSidGTRmVu+dV/QV 2JoQSy9qfn+fcm6/sUj25xXEY9BxDzpEkSjOmYZ5/72Sa3YRf+rchG8FzlyctSutzE TlymsaY3FK0jw== From: Sasha Levin To: quanyeyang@proton.me, matttbe@kernel.org, kuba@kernel.org Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] mptcp: reset msk state on early connect failure" failed to apply to 5.10-stable tree Date: Sat, 7 Nov 2026 06:24:46 -0500 Message-ID: <20261107062445-failed-5.10-29afe67082b2@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x 29afe67082b2d33ab2e90c56c337235d725f023f # git commit -s git send-email --to '' --in-reply-to '20261107062445-failed-5.10-29afe67082b2@kernel.org' --subject-prefix 'PATCH 5.10.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 29afe67082b2d33ab2e90c56c337235d725f023f Mon Sep 17 00:00:00 2001 From: Quanye Yang Date: Tue, 13 Oct 2026 16:29:19 +0200 Subject: [PATCH] mptcp: reset msk state on early connect failure mptcp_connect() can fall back before the subflow SYN is sent, for example when the netns is in an MPTCP blackhole, token allocation fails, or MD5SIG is in use. If the subsequent subflow connect() fails immediately (EAFNOSUPPORT, ENETUNREACH, ...), __inet_stream_connect() returns while the socket is still SS_UNCONNECTED and never calls ->disconnect(). This was reported by Clashiko [1]. The error path only dropped the token and moved the msk back to TCP_CLOSE. MPTCP_FALLBACK_DONE, allow_subflows and request_mptcp were left as after early fallback, so a later connect() on the same fd stayed TCP-only. Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/633 [1] Fixes: 0235d075a592 ("mptcp: mark as fallback even early ones") Cc: stable@vger.kernel.org Signed-off-by: Quanye Yang Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20261013-net-mptcp-misc-fixes-7-3-rc8-v1-1-932c9b182fc7@kernel.org Signed-off-by: Jakub Kicinski --- net/mptcp/protocol.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index e89a69ab927c9..e6f73a5ee630a 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -4212,9 +4212,16 @@ static int mptcp_connect(struct sock *sk, struct sockaddr_unsized *uaddr, * subflow_finish_connect() */ if (unlikely(err)) { - /* avoid leaving a dangling token in an unconnected socket */ mptcp_token_destroy(msk); mptcp_set_state(sk, TCP_CLOSE); + + spin_lock_bh(&msk->fallback_lock); + msk->allow_subflows = true; + msk->allow_infinite_fallback = true; + clear_bit(MPTCP_FALLBACK_DONE, &msk->flags); + spin_unlock_bh(&msk->fallback_lock); + + mptcp_subflow_ctx_reset(mptcp_subflow_ctx(ssk)); return err; } -- 2.53.0