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 766121A6834 for ; Tue, 19 May 2026 00:46:42 +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=1779151602; cv=none; b=r9fJWQ8zbq7ONK7JjFzjNv/kZvKxSoG2dLkjozYofMXSoM/Sv7aLcWMbR3DKgPSEvDHEb8x9FeK4qo8PIDPzeiFgu+8L1OkGn+jVulyVBQK+Nu8xbAN5HntDpBSQuz/65OfrxbamvCvkpeoT2cyG1/FIRGN4qo/iQmXrDdBgg/Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779151602; c=relaxed/simple; bh=96wBJN8JICdyNUYeO0N7+XlsfQwWEdsmdLieqzV22d8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hG4cihaDtzx8tHm2TEeNRAdEs79zfyKiahsnMM2V09SwNxRJnZ1sgRzGwJ9rDY3VanaT7sE2ev+7zke8Uvh47/LIagEE9FBsc5wqJ0vXD7FMusF3PkjK1UVut7P3+MM8bjOmb8aL3/EU7NHrXHZAPM8P5W2r6wGuKMy+IljrXJY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VsBwI3DI; 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="VsBwI3DI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8A0A3C2BCB7; Tue, 19 May 2026 00:46:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779151602; bh=96wBJN8JICdyNUYeO0N7+XlsfQwWEdsmdLieqzV22d8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VsBwI3DI6+yLUVeKpH216qCg1NrJhhZA7CefQFcuvhPCgYi2eFJ4kR2FvhboU6x3n tORZl41K5kzwk7iMoG3zgX7OPxVvqNCWi96YstJMVEUmx0Kc49dDnsHjs7FTI/iQV6 zDQwb9ehXjHhb0OFADyTAs11FHdFbK3qVmAS/inv1B+Gn3MQCwTfHSqUKPMmg8F8b+ Xh6bAY6y4uHQin2ltzaFEvuMfdR6bL9NnQlwS1OtaXGFOPx6Jy/yJrzWPVj6aadekd DCH7I+tAx60l82vfP4aM87fC6iN4Hs4HT/gN3ie6B7Z7cfmDHDWtSBlH9wIgZsnDXT pphQ3EA9/+Isw== From: Sasha Levin To: stable@vger.kernel.org Cc: "Matthieu Baerts (NGI0)" , Mat Martineau , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15.y] mptcp: pm: ADD_ADDR rtx: allow ID 0 Date: Mon, 18 May 2026 20:46:39 -0400 Message-ID: <20260519004639.1934738-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051201-garbage-juror-82cc@gregkh> References: <2026051201-garbage-juror-82cc@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 identical 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 6fb14148a96e0..53edf23a85c5f 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -327,9 +327,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