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 A35213AFAF4 for ; Tue, 12 May 2026 14:20:32 +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=1778595632; cv=none; b=D45vG76X+ZmGEmjrEXd70QM42tlIUCkQ0pv7wxybwieBJI+bii0UQQppMbdUtsXnLjbI+Xq9VuRDu+xeownVDP/ADDSGWkZH0IQrpkNh3x5EkrxDnlLuoGvnfqKylZEvA3eXWYjIr3/dNrN/5/DzYOzqQwsTzKrIQAg9NyH/XPY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778595632; c=relaxed/simple; bh=y7c8Hx4IXw3PjWHgb2QjieHMYgRwRtI59aLnUG1s2jo=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=N72DEoJiyTOTwIzb7zIkYKFo6srgvf3hGAp1+tq8rd4IWjKaP5rZUZoBmTjUHTcW7YS9xZXF1C5sGqTOXCc+lHA/nvxtnzMJBhcDcYta+2Na3ezrgIBDYZwsB5DAuJUjdIQhXWE9gR5nZMa82/W429lLH+ZoprrDJoScOy/MyUo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=RpLHQn0V; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="RpLHQn0V" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0EA76C2BCB0; Tue, 12 May 2026 14:20:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778595632; bh=y7c8Hx4IXw3PjWHgb2QjieHMYgRwRtI59aLnUG1s2jo=; h=Subject:To:Cc:From:Date:From; b=RpLHQn0VuV4Q3b7fYksUSMgT0+FWKq3cnN1hpL5F0wsFo/njeK3tYfszu6OnrQ5/n yGz6jWQC2y0UPAHfBW83l8YDiQbeXO/s/IfH021cHNHDewx9T/IYAMGKxWPYgz9i16 C1E3NWjK8BTgTrwmFDo4AEv0BFXJv6Eu0aDHKx2I= Subject: FAILED: patch "[PATCH] mptcp: pm: prio: skip closed subflows" failed to apply to 6.1-stable tree To: matttbe@kernel.org,kuba@kernel.org,martineau@kernel.org Cc: From: Date: Tue, 12 May 2026 16:20:29 +0200 Message-ID: <2026051229-ozone-hardener-e249@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 6.1-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-6.1.y git checkout FETCH_HEAD git cherry-pick -x 166b78344031bf7ac9f55cb5282776cfd85f220e # git commit -s git send-email --to '' --in-reply-to '2026051229-ozone-hardener-e249@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 166b78344031bf7ac9f55cb5282776cfd85f220e Mon Sep 17 00:00:00 2001 From: "Matthieu Baerts (NGI0)" Date: Tue, 5 May 2026 17:00:57 +0200 Subject: [PATCH] mptcp: pm: prio: skip closed subflows 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 diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 4a6e5ab30d80..3c152bf66cd5 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -284,6 +284,9 @@ int mptcp_pm_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;