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 5443F3F789A for ; Mon, 18 May 2026 11:48:43 +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=1779104923; cv=none; b=hjD4VvNqHPiG/yH9uGb+tPXPZ+95+THckpeAItec+kUfF7E52XYZwM4U2pZzDfWa29gj1LWw5GevoznS3ZJcdSo44IlPG6mZ/0cVSzDIlVZ3GL5GLQ8hWOxYNS0T3KEq4/d/XT10Eilwdxw2mrggYYL6+4AeoUIZag+tT1JMguU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779104923; c=relaxed/simple; bh=QRtzSJ2vmMLJk8YD9zc7q2U9gj8hI3VpM++SEZDRFt8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LplfAyjo6o/yjXXMo8SOybMa6FhK6bOpoveqr23qytWjf0w/fgsjAhggWwR47sKEeyJbtzSlLYbkLKU78ZT1CiILw4gXOPAI/mGLTM7cxfqMDXIBb4duvAcP93vMRyyn5r303eRYgCCwIAPFDLZoCL+iEMv52gLM21xBq68NtBM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CqFOazuw; 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="CqFOazuw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 99CDAC2BCB7; Mon, 18 May 2026 11:48:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779104923; bh=QRtzSJ2vmMLJk8YD9zc7q2U9gj8hI3VpM++SEZDRFt8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CqFOazuwO556OWd8/3D5KZ4WmzdJilo1pMMYAimQ1zvDYropwHSAkc7NwEtCGdpeX hdv2Kq2Hs8c906MHGDFsS7xa8O9rsJksV0qga9jnSQGqtnJ02b7FBclg45Ymanki5Z k9d3uX/jw2D+UuNzg+Ciqrw1/n6r2wwtV8fJQhUw3mrHqqSxjwJJTLpE7RbY++ss28 Gqq7wndNaEe71URxyzl6kQvC8OkYFPTDkOh3XkQvZphNKXtxfYNphUL3bLQscs3mO2 HfMM6jaZ/rawXEqLsaFs/hqlylljyTy0GWjBC6mSUIQE4evtdKAR71YyT8bfXj+bc+ mhdfJc9SomHwg== From: Sasha Levin To: stable@vger.kernel.org Cc: "Matthieu Baerts (NGI0)" , Mat Martineau , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.12.y] mptcp: pm: prio: skip closed subflows Date: Mon, 18 May 2026 07:48:40 -0400 Message-ID: <20260518114840.790663-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051228-credit-ship-91cd@gregkh> References: <2026051228-credit-ship-91cd@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "Matthieu Baerts (NGI0)" [ Upstream commit 166b78344031bf7ac9f55cb5282776cfd85f220e ] When sending an MP_PRIO, closed subflows need to be skipped. This fixes the case where the initial subflow got closed, re-opened later, then an MP_PRIO is needed for the same local address. Note that explicit MP_PRIO cannot be sent during the 3WHS, so it is fine to use __mptcp_subflow_active(). Fixes: 067065422fcd ("mptcp: add the outgoing MP_PRIO support") Cc: stable@vger.kernel.org Fixes: b29fcfb54cd7 ("mptcp: full disconnect implementation") Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260505-net-mptcp-pm-fixes-7-1-rc3-v1-9-fca8091060a4@kernel.org Signed-off-by: Jakub Kicinski [ applied to renamed function `mptcp_pm_nl_mp_prio_send_ack()` in `pm_netlink.c` ] Signed-off-by: Sasha Levin --- net/mptcp/pm_netlink.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 3ac09bfe6e4b2..085cf338ced19 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -920,6 +920,9 @@ int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk, struct sock *ssk = mptcp_subflow_tcp_sock(subflow); struct mptcp_addr_info local, remote; + if (!__mptcp_subflow_active(subflow)) + continue; + mptcp_local_address((struct sock_common *)ssk, &local); if (!mptcp_addresses_equal(&local, addr, addr->port)) continue; -- 2.53.0