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 C2C1A3905F0 for ; Tue, 12 May 2026 14:20:45 +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=1778595645; cv=none; b=p7BpJukQp85YkYKxR2vJ5j9F1cGPG2eNc6YDgQ74OuRRv+f9oeFL3IMqKYv/IBeSYfiXa+1CEozCuY28tshgc09A7PJ1TSpOm6i4JMlvJVu5b92lrjEqgGgNTeWLQ1XJ+3GRiIzcrjHzvWN72puslus/y070wda1HJ9IqLPfDiY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778595645; c=relaxed/simple; bh=eh1dp5NGfQfSz+4eDDcKaDJoMl4XEn2GUC5HawaiSAw=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=a8fBCDgdK+6VSfNyI2lHprYur493ZXWvmZ75B6VsSfNfMp8RC1WUaVUABYJjGisXoYOv+nKqYtOrc8GKQT6uTKWRiNbBbmcqLZuOSb9zsbZAyuP5OAes2PpOvBlhgPvvFkgCXQ562gj/ZRKYq1eREEJdjeDhbGUgVrRiu9QQqj8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gdWEaHTu; 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="gdWEaHTu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B982C2BCB0; Tue, 12 May 2026 14:20:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778595645; bh=eh1dp5NGfQfSz+4eDDcKaDJoMl4XEn2GUC5HawaiSAw=; h=Subject:To:Cc:From:Date:From; b=gdWEaHTuA/xShU1z3BgE4pmeK+sb+9pEh6cPLjzlKGLxZOJ13msRxef7oRslReRoU LPXHpOnN23X1WnOtGwdyrKxpYgdKynSwccZfGKgcrjg5UuMCidRruN8hOADhopDzUi G5rzcqsNKQSKzQH72eo/vfR1I9W/qaWbwwcmdk+w= Subject: FAILED: patch "[PATCH] mptcp: pm: kernel: correctly retransmit ADD_ADDR ID 0" failed to apply to 6.6-stable tree To: matttbe@kernel.org,kuba@kernel.org,martineau@kernel.org Cc: From: Date: Tue, 12 May 2026 16:20:44 +0200 Message-ID: <2026051244-unrivaled-everglade-a9bc@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.6-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.6.y git checkout FETCH_HEAD git cherry-pick -x b12014d2d36eaed4e4bec5f1ac7e91110eeb100d # git commit -s git send-email --to '' --in-reply-to '2026051244-unrivaled-everglade-a9bc@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From b12014d2d36eaed4e4bec5f1ac7e91110eeb100d Mon Sep 17 00:00:00 2001 From: "Matthieu Baerts (NGI0)" Date: Tue, 5 May 2026 17:00:49 +0200 Subject: [PATCH] mptcp: pm: kernel: correctly retransmit ADD_ADDR ID 0 When adding the ADD_ADDR to the list, the address including the IP, port and ID are copied. On the other hand, when the endpoint corresponds to the one from the initial subflow, the ID is set to 0, as specified by the MPTCP protocol. The issue is that the ID was reset after having copied the ID in the ADD_ADDR entry. So the retransmission was done, but using a different ID than the initial one. Fixes: 8b8ed1b429f8 ("mptcp: pm: reuse ID 0 after delete and re-add") Cc: stable@vger.kernel.org Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260505-net-mptcp-pm-fixes-7-1-rc3-v1-1-fca8091060a4@kernel.org Signed-off-by: Jakub Kicinski diff --git a/net/mptcp/pm_kernel.c b/net/mptcp/pm_kernel.c index c9f1e5af3cd3..fc818b63752e 100644 --- a/net/mptcp/pm_kernel.c +++ b/net/mptcp/pm_kernel.c @@ -347,6 +347,8 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk) /* check first for announce */ if (msk->pm.add_addr_signaled < endp_signal_max) { + u8 endp_id; + /* due to racing events on both ends we can reach here while * previous add address is still running: if we invoke now * mptcp_pm_announce_addr(), that will fail and the @@ -360,19 +362,20 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk) if (!select_signal_address(pernet, msk, &local)) goto subflow; + /* Special case for ID0: set the correct ID */ + endp_id = local.addr.id; + if (endp_id == msk->mpc_endpoint_id) + local.addr.id = 0; + /* If the alloc fails, we are on memory pressure, not worth * continuing, and trying to create subflows. */ if (!mptcp_pm_alloc_anno_list(msk, &local.addr)) return; - __clear_bit(local.addr.id, msk->pm.id_avail_bitmap); + __clear_bit(endp_id, msk->pm.id_avail_bitmap); msk->pm.add_addr_signaled++; - /* Special case for ID0: set the correct ID */ - if (local.addr.id == msk->mpc_endpoint_id) - local.addr.id = 0; - mptcp_pm_announce_addr(msk, &local.addr, false); mptcp_pm_addr_send_ack(msk);