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 58D3BEEA8 for ; Tue, 19 May 2026 01:22:46 +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=1779153766; cv=none; b=OefOblO5iaPNahdsruH/LviKPNaZbhwQkA7i8U15/6aA9hIEoAy0oARoeCcsWHsLh+mw6v6GeaqRVbDJ+1X0Yj5HCO0I9QSj2XWEiI6UxvLwHA+MX68w6uiR3IVNtFdQtFrAHnT1jjy0IVW+6+0wajjOnyJSqVezyU929IhthmU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779153766; c=relaxed/simple; bh=hieqZPCYXxdqXS7WlrIvgT/G5tRBSgO35mlbhUrsnd4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ggsCErDR97PNHBsjQZQxVXzQvNzFaf/aPDdzHyk2JZR25nT7klbiJIaVjOmcwLQs1wwCR5j6YPKRWGd/nqYseQB14ur7dXdGtM2/erCIhQJX4FtY7/ncfNMusTyD7K2ZtH5UrFsbx5FEZgd1f0TEzk0N7cRiJxb1SP+/Bnci7yo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=i/GabZSf; 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="i/GabZSf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 599B9C2BCB7; Tue, 19 May 2026 01:22:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779153765; bh=hieqZPCYXxdqXS7WlrIvgT/G5tRBSgO35mlbhUrsnd4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i/GabZSf4irtfgeEWipSMHH6U3pMjEIzJsYAkMaxQwf6ZexwTL2mEx0sQPyH/Vjku fpJW6ac2fn65O9uPlhzSyPdiOBya31rYiy7oF/nrOXmIS0vQoRli7sk7N3Bn+giSX2 qelEbYC02pr7q808qYJkt6IzSP7VGArIQYUYQevmdGYrRKv6GIJKRT42smhrZvD0Wb Zeu7GJWQJa7c4R2iImd26I/R+boSesZOKTE7k1CQpDg0JPK5K9v463prtcgxTBPMxt JYErsEUTKNNsUASltdW90HNlWsq8JhR9nD3V85V/fkjEgzvEtgUV97HzgNWVpW+EHO NG4vkwT9azRXg== From: Sasha Levin To: stable@vger.kernel.org Cc: "Matthieu Baerts (NGI0)" , Mat Martineau , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.10.y] mptcp: pm: ADD_ADDR rtx: allow ID 0 Date: Mon, 18 May 2026 21:22:43 -0400 Message-ID: <20260519012243.2020041-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051201-lumber-mullets-8690@gregkh> References: <2026051201-lumber-mullets-8690@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 03f324f3f1f7619a47b9c91282cb12775ab0a2f1 ] ADD_ADDR can be sent for the ID 0, which corresponds to the local address and port linked to the initial subflow. Indeed, this address could be removed, and re-added later on, e.g. what is done in the "delete re-add signal" MPTCP Join selftests. So no reason to ignore it. Fixes: 00cfd77b9063 ("mptcp: retransmit ADD_ADDR when timeout") 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-2-fca8091060a4@kernel.org Signed-off-by: Jakub Kicinski [ applied the 3-line deletion to net/mptcp/pm_netlink.c ] Signed-off-by: Sasha Levin --- net/mptcp/pm_netlink.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index b88246b8f21c1..bcff6b0b2e8fc 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -223,9 +223,6 @@ static void mptcp_pm_add_timer(struct timer_list *timer) if (inet_sk_state_load(sk) == TCP_CLOSE) return; - if (!entry->addr.id) - return; - if (mptcp_pm_should_add_signal(msk)) { sk_reset_timer(sk, timer, jiffies + TCP_RTO_MAX / 8); goto out; -- 2.53.0