From mboxrd@z Thu Jan 1 00:00:00 1970 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 E71DD3A9627; Tue, 16 Jun 2026 17:54:45 +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=1781632486; cv=none; b=jH31HlCgHoIfBcSe/z7kRKt9YDcKtfj+tfgm3XGXauQbopqeUHlyDuqadt2Emh08Ge/tbNHFOj65uMwz0kIYXSZTM84Qy8gK6B6xSeUMRnrtttf9wDNUYOgtmJ7x/+j3IzTioWHOHU2k9e2i767Ah6cRi+Yt4EfpH9djQPbZySE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781632486; c=relaxed/simple; bh=/4DppKUPfF3lK7q2/20pO3nAwTp2pCVCpvISywEjHTg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f5vz1RPdA0cSa0D2APXisOvL1yhhiVzQlWOK14f/dhdhSzgSb5HZGVqzeec48wgsPDj//6qU7Lc1o8M11jikfg3jXBAeJVObCBZWeU5wjd6fe1lAKaIjO9JORSU2dlJFa21zXaRnMlI+/XQ5EVpEMZ/+YxdqMjCdy42O0AaJwS8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=aRTpgf1s; 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="aRTpgf1s" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E8C1A1F000E9; Tue, 16 Jun 2026 17:54:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781632485; bh=cfVlzjJxqDeZ41eDXrlLUW5zg0wFLC7gL1JroEMlORs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=aRTpgf1sn2eMxNsAj2gCouOSBsoh71qWteAjs29OJy04w6VQWL6wL5SC4y8s70L+r Rs2Mi+hDXBQQJz0itHPIWfvoBXg+hS1iiqIpmWl7vBpAQ0LYhC1y/N9frOAQ2XDZvK ucNGIZFfsU5+ze2qpDINQenAcLLdol6tuzNVmd3M= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mat Martineau , "Matthieu Baerts (NGI0)" , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1 421/522] mptcp: pm: prio: skip closed subflows Date: Tue, 16 Jun 2026 20:29:28 +0530 Message-ID: <20260616145145.692722311@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145125.307082728@linuxfoundation.org> References: <20260616145125.307082728@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ 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 Signed-off-by: Greg Kroah-Hartman --- net/mptcp/pm_netlink.c | 3 +++ 1 file changed, 3 insertions(+) --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -924,6 +924,9 @@ int mptcp_pm_nl_mp_prio_send_ack(struct 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;