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 1784E15665C for ; Mon, 18 May 2026 14:23:36 +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=1779114217; cv=none; b=pJmqgRSQIWY6S/pkCJIpj8FNBfseWFRrIdbOGT/yCbhbwytiBqdnlJ5Fi1DMKWc4Lm68Tyk6NckTDUtVvlFcQuzi126SCbX/XGBcUlLcEeQs7A81v3GVGMLrFOAqJKktwPzrAthOqIGpXPnWSiwGIrzeDvZBDu4E6qPTlK3KyTI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779114217; c=relaxed/simple; bh=jU6b3Nt+SSEJiH2nLc0XiW1nK3VX2RtmOLAj4Cx92oc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oM5D7pDnkjPOp3uBogagn+SS8CzwNQFSikkYSrF2621ARbptjMH2ymT/s6jtIXU0We8qBuLZVGlD+oCqR989FP9ZnMffFkcd8bbnEwaOKpXY56gwU2YJelKjx6KFYJF1bzfq15sDz+M7F/h/Y8IY4J5bifkx2xbx09VPo4mduEU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gv1jdX5U; 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="gv1jdX5U" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A9E15C2BCB8; Mon, 18 May 2026 14:23:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779114216; bh=jU6b3Nt+SSEJiH2nLc0XiW1nK3VX2RtmOLAj4Cx92oc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gv1jdX5U2gTZUP0DEl1Af2QRYMvyb+yfSt0bAbQ8cPCnV5V+kMsVr1/zNYn02uudi oBwDzXiqXnBBsgQ1+rarY+RtxFQ9ehYjYIiKoUuu+iq7ITfUCiFr3Xul6sqXhn4iwz PxnlffUL47r3NWoh5BFB4ajF0+MWMltLD79ghQjpMRD2wamU0hGirYotsZjlQxLAIZ z4fUWEnqUlmbQHKhaBCniUqkBpwHCxItZUgZSMrVhR3cLynceduO0AdjA5Db/KfAL1 Up8k8DiOVayoLQPTA/kwN3ggDbrV/f/ZavUAelbdKEyPCWSdY2PMb0gpQ6dMY0JfOh HTsWXW2L+H8AQ== From: Sasha Levin To: stable@vger.kernel.org Cc: "Matthieu Baerts (NGI0)" , Mat Martineau , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15.y] mptcp: pm: prio: skip closed subflows Date: Mon, 18 May 2026 10:23:33 -0400 Message-ID: <20260518142333.1308198-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051229-impotent-overhung-2887@gregkh> References: <2026051229-impotent-overhung-2887@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 6fb14148a96e0..62263743fcf21 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -828,6 +828,9 @@ int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk, struct sock *sk = (struct sock *)msk; struct mptcp_addr_info local; + if (!__mptcp_subflow_active(subflow)) + continue; + mptcp_local_address((struct sock_common *)ssk, &local); if (!addresses_equal(&local, addr, addr->port)) continue; -- 2.53.0