mptcp: pm: ADD_ADDR rtx: free sk if last

When an ADD_ADDR is retransmitted, the sk is held in sk_reset_timer(),
and released at the end.

If at that moment, it was the last reference being held, the sk would
not be freed. sock_put() should then be called instead of __sock_put().

But that's not enough: if it is the last reference, sock_put() will call
sk_free(), which will end up calling sk_stop_timer_sync() on the same
timer, and waiting indefinitely to finish. So it is needed to mark that
the timer is done at the end of the timer handler when it has not been
rescheduled, not to call sk_stop_timer_sync() on "itself".

Fixes: 00cfd77b9063 ("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-5-fca8091060a4@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index 2a01bf1b5bfdad401383e3ca21f097bdda57dd4e..8899327e59a1da6897e7ac89a7ce8c5e84c98859 100644 (file)
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -16,6 +16,7 @@ struct mptcp_pm_add_entry {
        struct list_head        list;
        struct mptcp_addr_info  addr;
        u8                      retrans_times;
+       bool                    timer_done;
        struct timer_list       add_timer;
        struct mptcp_sock       *sock;
        struct rcu_head         rcu;
@@ -327,22 +328,22 @@ static void mptcp_pm_add_timer(struct timer_list *timer)
                                                              add_timer);
        struct mptcp_sock *msk = entry->sock;
        struct sock *sk = (struct sock *)msk;
-       unsigned int timeout;
+       unsigned int timeout = 0;
 
        pr_debug("msk=%p\n", msk);
 
+       bh_lock_sock(sk);
        if (unlikely(inet_sk_state_load(sk) == TCP_CLOSE))
-               goto exit;
+               goto out;
 
-       bh_lock_sock(sk);
        if (sock_owned_by_user(sk)) {
                /* Try again later. */
-               sk_reset_timer(sk, timer, jiffies + HZ / 20);
+               timeout = HZ / 20;
                goto out;
        }
 
        if (mptcp_pm_should_add_signal_addr(msk)) {
-               sk_reset_timer(sk, timer, jiffies + TCP_RTO_MAX / 8);
+               timeout = TCP_RTO_MAX / 8;
                goto out;
        }
 
@@ -360,8 +361,9 @@ static void mptcp_pm_add_timer(struct timer_list *timer)
        }
 
        if (entry->retrans_times < ADD_ADDR_RETRANS_MAX)
-               sk_reset_timer(sk, timer,
-                              jiffies + (timeout << entry->retrans_times));
+               timeout <<= entry->retrans_times;
+       else
+               timeout = 0;
 
        spin_unlock_bh(&msk->pm.lock);
 
@@ -369,9 +371,13 @@ static void mptcp_pm_add_timer(struct timer_list *timer)
                mptcp_pm_subflow_established(msk);
 
 out:
+       if (timeout)
+               sk_reset_timer(sk, timer, jiffies + timeout);
+       else
+               /* if sock_put calls sk_free: avoid waiting for this timer */
+               entry->timer_done = true;
        bh_unlock_sock(sk);
-exit:
-       __sock_put(sk);
+       sock_put(sk);
 }
 
 struct mptcp_pm_add_entry *
@@ -434,6 +440,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk,
 
        timer_setup(&add_entry->add_timer, mptcp_pm_add_timer, 0);
 reset_timer:
+       add_entry->timer_done = false;
        timeout = mptcp_adjust_add_addr_timeout(msk);
        if (timeout)
                sk_reset_timer(sk, &add_entry->add_timer, jiffies + timeout);
@@ -454,7 +461,8 @@ static void mptcp_pm_free_anno_list(struct mptcp_sock *msk)
        spin_unlock_bh(&msk->pm.lock);
 
        list_for_each_entry_safe(entry, tmp, &free_list, list) {
-               sk_stop_timer_sync(sk, &entry->add_timer);
+               if (!entry->timer_done)
+                       sk_stop_timer_sync(sk, &entry->add_timer);
                kfree_rcu(entry, rcu);
        }
 }