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 4E52C2264B0 for ; Tue, 19 May 2026 00:45:40 +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=1779151540; cv=none; b=CoP7oRHha1I8rY8XVKEocW4NpUOoWnZW7+sk/dMr9DVvgMs5pQWZb16WhszJcoQCQn7UEaiitH083KWgbG7xa+BZJrtFjVd+QPVoo/Lgubkolc5J87wsrj0DURbpcKuJu8wU8iLwtZEgET1GOoZaIfSY+46L0kaWNz+8qCvKi2k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779151540; c=relaxed/simple; bh=REnzSzMg+AAHxaBknZ1X4XtmW7CPDU9fno3/73/5+MQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DTvSsjww7GdFw/w3f1ZKlRulMmQeSLkXHYB4jzbrPBnSvJQU5PVhwpbNlvge/oyrU1Tt8ig3VxAv1J0q2V8m54W0Ru9n4nwnGorBeZnnnEGgLt96HS17TUUqF+qJV+zVgdt9kFkZtooXg3DDNaHsMc6Rb/d1LfwZ3Nf09M5/vV0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ghkL+dvP; 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="ghkL+dvP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 65E1FC2BCB7; Tue, 19 May 2026 00:45:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779151540; bh=REnzSzMg+AAHxaBknZ1X4XtmW7CPDU9fno3/73/5+MQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ghkL+dvP23QqnD5Jlp/LoKm9OjenWRWvmvRIA2RiOiqSpGP7aS5LF/IrdLV+reWMb obQNcPwvCccRh4ioBLiyUcuiivHtKYI31KcwSHy6kTYyHIj5pNypJebKhQA5NgRRQE 6fKAW4atMJjiPk/YRHc3hek2X3Ct4b210VY7bOhbbP2TSGWEhcRjbINfr3BFj0b/dM m2b5O1nbR7WJF1vv1bkTxPG+hmfnmf8vJfz0peqfLywvnq06lBEZ9Ef0m1DyyVe7Rh 6R/bKBPD8kRbBzxUk9B0KlzZ+66y9CBnJOpp5QRulOuoc6QOthRgp1FRK5NARkr0XL lyzjr0YC+9Z0A== 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: free sk if last Date: Mon, 18 May 2026 20:45:37 -0400 Message-ID: <20260519004537.1928014-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051243-certainty-pyromania-d178@gregkh> References: <2026051243-certainty-pyromania-d178@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 b7b9a461569734d33d3259d58d2507adfac107ed ] 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 Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260505-net-mptcp-pm-fixes-7-1-rc3-v1-5-fca8091060a4@kernel.org Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/mptcp/pm_netlink.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index a16a7a538c425..85d828979bdfe 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -28,6 +28,7 @@ struct mptcp_pm_add_entry { struct timer_list add_timer; struct mptcp_sock *sock; u8 retrans_times; + bool timer_done; struct rcu_head rcu; }; @@ -305,7 +306,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer) struct mptcp_pm_add_entry *entry = from_timer(entry, 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); @@ -319,7 +320,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer) return; 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; } @@ -336,9 +337,8 @@ static void mptcp_pm_add_timer(struct timer_list *timer) entry->retrans_times++; } - if (entry->retrans_times < ADD_ADDR_RETRANS_MAX) - sk_reset_timer(sk, timer, - jiffies + timeout); + if (entry->retrans_times >= ADD_ADDR_RETRANS_MAX) + timeout = 0; spin_unlock_bh(&msk->pm.lock); @@ -346,7 +346,12 @@ static void mptcp_pm_add_timer(struct timer_list *timer) mptcp_pm_subflow_established(msk); out: - __sock_put(sk); + 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; + sock_put(sk); } struct mptcp_pm_add_entry * @@ -410,6 +415,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_get_add_addr_timeout(net); if (timeout) sk_reset_timer(sk, &add_entry->add_timer, jiffies + timeout); @@ -430,7 +436,8 @@ 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); } } -- 2.53.0