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 DBAD2148850 for ; Mon, 18 May 2026 14:33:54 +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=1779114834; cv=none; b=jPoLBHxi+urVTvn2taV5wK6v2RMp03tAGc04nvTvu9AnGjUvI1PHwp3TORo2HppGxigMqk1KjqoVV0hMPaYYNOD2WW9jdOBXHuav2BdTVFkUaR35PtPrqdRIOtHgxKTlJULo1SgMPMmciRnzmp9u4Kg2XRxzzOHj4znP6nZeN4Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779114834; c=relaxed/simple; bh=WywCetxTJC2PbbYlIVMl9EOvcLxWkKTitHLCZuGTkfo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IHDcE7n1onSoCFNrr2kGQUGZSsUY1CmNGFXSdNsLSfoIPQiqY9vDOC/8eiPnNjsp3V9mif+vEfoliY8UgmmIqs9S8/o9vXJRX9PgHSOq30hfGQBbJGHEdBhHHdzqRh2f6fkRKn//o4bwyTkwXImCieZfwc82rMkCiJpapjMvBoY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QlKHghlL; 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="QlKHghlL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8998C2BCB7; Mon, 18 May 2026 14:33:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779114834; bh=WywCetxTJC2PbbYlIVMl9EOvcLxWkKTitHLCZuGTkfo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QlKHghlLk70/DFKjjXLVoegdHYjA3v0MlvhtTVFq4Ae4/gYdh19WAd4IFdxJ7vLDg XqFqabaFKTjIWK6g3CJwtEWFkS5pNfxLESLx7VqRyw+SkGbrW9zj/Yp1a8/JvRCaJN KNd6V4a4uHFo1vfAax3z12LqCf0NdPLx055XejBC3gFPPPvufheHOdjeKcjuBWPoBK c1IQ/LiUF8hn6X9QQ+fDWpyCZ9KsPL3tEc39ZyrEJ1WuXJWlujGYSD3ZOqZPMKqyUX xZVWPwwD6IucgZsc2ZrAfK5GFZOMT88ri+E3EAFIHMWjgSs+wJ1gbjcvx/9O2OBTGM ufaD57+CmT2cQ== From: Sasha Levin To: stable@vger.kernel.org Cc: "Matthieu Baerts (NGI0)" , Mat Martineau , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1.y] mptcp: pm: ADD_ADDR rtx: allow ID 0 Date: Mon, 18 May 2026 10:33:51 -0400 Message-ID: <20260518143351.1340874-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051201-numerator-unmoving-740b@gregkh> References: <2026051201-numerator-unmoving-740b@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 [ relocated the 3-line deletion from net/mptcp/pm.c 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 a16a7a538c425..69e08935fc079 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -315,9 +315,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_addr(msk)) { sk_reset_timer(sk, timer, jiffies + TCP_RTO_MAX / 8); goto out; -- 2.53.0