Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 EECB848EBC2 for ; Wed, 29 Jul 2026 13:34:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785332102; cv=none; b=JL2uEA3qBDgEoYAMNMJEV4t5VN+oxFQ8Z0a1WNNKrWK6WJCLW2Bs+QjNbrfHk1rQJQpR056i7nZZ0+2Ib9mk8fcPXeUHwl35m5/W+m/MHsaYsUDUg0D92oIzsLX7S3c9rUXdxxHRBhbU4bbGaPFebS1Z2mtMh5IUR8wBRv0wQLk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785332102; c=relaxed/simple; bh=1xNt5SfVXi2UwjxfBXmTZgDOjZbzoTGbX+mlVIBrvCY=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=gXWDebTYLDrhRlyHtDVSvJVUip3qz4z4ocTGtsaUIC3Z+zgdWdhD69/gW9HB+LDTqIgWUUYHpEywO462JITHlNvxpOkKrrVHCkNrjeQQhlyg8zIS7FrJew6YiPDXCTzWLImRQpi1G55yVEs5cicB97NtBWMJDtaM10HaT+oT9qk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=pfjhEZfS; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="pfjhEZfS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 572BE1F000E9; Wed, 29 Jul 2026 13:34:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1785332098; bh=UJ1dKc6yLyKKC8zuN0yBbPce6+BFcHiaJdWmj/PhfKY=; h=Subject:To:Cc:From:Date; b=pfjhEZfS0N6cdKzu3IGCch8kTkRMG83U7hzFMvifb7o/Y2hTBFRGIAcvHFXXzs58M MbIjjgGZCkFW8jfB2ZQOnmJ/ufaazsaissHgoftqg2hvgNYo2e7CiHO0pKAJclyApW PDXhowZE/B6IEJUrKK1I52bn7Qr3f4VmIegvCab0= Subject: FAILED: patch "[PATCH] mptcp: decrement subflows counter on failed passive join" failed to apply to 5.15-stable tree To: zhaochenguang@kylinos.cn,kuba@kernel.org,matttbe@kernel.org Cc: From: Date: Wed, 29 Jul 2026 15:34:45 +0200 Message-ID: <2026072945-judge-corset-9953@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.15-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.15.y git checkout FETCH_HEAD git cherry-pick -x f3ca0ee2cc308e33896536789cbc5f3a12ca7b30 # git commit -s git send-email --to '' --in-reply-to '2026072945-judge-corset-9953@gregkh' --subject-prefix 'PATCH 5.15.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From f3ca0ee2cc308e33896536789cbc5f3a12ca7b30 Mon Sep 17 00:00:00 2001 From: Chenguang Zhao Date: Wed, 22 Jul 2026 00:14:38 +0200 Subject: [PATCH] mptcp: decrement subflows counter on failed passive join mptcp_pm_allow_new_subflow() increments extra_subflows before __mptcp_finish_join() on the passive MP_JOIN path. In case of race conditions, the subflow is dropped without calling mptcp_close_ssk(), so the counter is not rolled back. Call mptcp_pm_close_subflow() when the join completion fails to decrement the subflows counter. Fixes: 10f6d46c943d ("mptcp: fix race between MP_JOIN and close") Cc: stable@vger.kernel.org Signed-off-by: Chenguang Zhao Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260722-net-mptcp-misc-fixes-7-2-rc5-v1-1-6fb595bc86ef@kernel.org Signed-off-by: Jakub Kicinski diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index cb9515f505aa..b32f0cd262a7 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3907,6 +3907,7 @@ bool mptcp_finish_join(struct sock *ssk) mptcp_data_unlock(parent); if (!ret) { + mptcp_pm_close_subflow(msk); err_prohibited: subflow->reset_reason = MPTCP_RST_EPROHIBIT; return false;