Skip to content

Commit 7e61444

Browse files
matttbegregkh
authored andcommitted
mptcp: pm: ADD_ADDR rtx: allow ID 0
commit 03f324f upstream. 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: 00cfd77 ("mptcp: retransmit ADD_ADDR when timeout") Cc: stable@vger.kernel.org Reviewed-by: Mat Martineau <martineau@kernel.org> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Link: https://patch.msgid.link/20260505-net-mptcp-pm-fixes-7-1-rc3-v1-2-fca8091060a4@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 1d77f82 commit 7e61444

1 file changed

Lines changed: 0 additions & 3 deletions

File tree

net/mptcp/pm.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,9 +350,6 @@ static void mptcp_pm_add_timer(struct timer_list *timer)
350350
if (inet_sk_state_load(sk) == TCP_CLOSE)
351351
return;
352352

353-
if (!entry->addr.id)
354-
return;
355-
356353
if (mptcp_pm_should_add_signal_addr(msk)) {
357354
sk_reset_timer(sk, timer, jiffies + TCP_RTO_MAX / 8);
358355
goto out;

0 commit comments

Comments
 (0)