mptcp: pm: fix memory leak from alloc-during-teardown race

mptcp_pm_destroy() empties msk->pm.anno_list and
msk->pm.userspace_pm_local_addr_list under msk->pm.lock during socket
teardown, dropping the lock between the two.

A concurrent userspace PM genl ANNOUNCE on the same msk holds a sock
reference via mptcp_token_get_sock() and, in
mptcp_pm_nl_announce_doit(), calls
mptcp_userspace_pm_append_new_local_addr() and
mptcp_pm_announced_alloc(). Both take msk->pm.lock briefly to add to
their respective lists. Because the genl handler holds a sock reference,
mptcp_pm_destroy() may run on the same msk via mptcp_disconnect(), which
invokes mptcp_destroy_common() without dropping the sock refcount,
before the handler completes.

If the lock acquisitions interleave such that mptcp_pm_destroy() empties
a list first, the later alloc adds its entry to a list head that nothing
else iterates for this msk, and the entry leaks. kmemleak reports both
mptcp_pm_add_addr objects (from mptcp_pm_announced_alloc()) and
mptcp_pm_addr_entry objects (from
mptcp_userspace_pm_append_new_local_addr()) under sustained concurrent
ANNOUNCE + close load against the userspace PM.

Add an MPTCP_PM_DESTROYING bit in msk->pm.status, set by
mptcp_pm_destroy() under pm.lock before the lists are emptied and
checked under pm.lock by the alloc paths. Either the alloc takes pm.lock
first, in which case its entry is on the list when mptcp_pm_destroy()
frees it; or mptcp_pm_destroy() takes pm.lock first, in which case the
later alloc observes the bit and refuses.

Found by an MPTCP protocol-flow harness extending BRF (arXiv:2305.08782).

Fixes: 9ab4807c84a4 ("mptcp: netlink: Add MPTCP_PM_CMD_ANNOUNCE")
Cc: stable@vger.kernel.org
Signed-off-by: Shardul Bankar <shardul.b@mpiricsoftware.com>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20260803-net-mptcp-misc-fixes-7-2-rc6-v2-6-b8f496d71664@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index c71dcf887683c9068e60d23b128f209177a5a79d..64a1236aabee96600bb2760307fbf3b1c70374a1 100644 (file)
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -443,6 +443,9 @@ bool mptcp_pm_announced_alloc(struct mptcp_sock *msk,
 
        lockdep_assert_held(&msk->pm.lock);
 
+       if (msk->pm.status & BIT(MPTCP_PM_DESTROYING))
+               return false;
+
        add_entry = mptcp_pm_announced_lookup(msk, addr);
        if (add_entry) {
                if (WARN_ON_ONCE(mptcp_pm_is_kernel(msk)))
@@ -1145,10 +1148,16 @@ void mptcp_pm_worker(struct mptcp_sock *msk)
 
 void mptcp_pm_destroy(struct mptcp_sock *msk)
 {
+       spin_lock_bh(&msk->pm.lock);
+       msk->pm.status |= BIT(MPTCP_PM_DESTROYING);
+       spin_unlock_bh(&msk->pm.lock);
+
        mptcp_pm_free_announced_list(msk);
 
-       if (mptcp_pm_is_userspace(msk))
-               mptcp_userspace_pm_free_local_addr_list(msk);
+       /* Free the userspace local address list unconditionally: the socket
+        * can be reused (mptcp_disconnect()) and re-selected to a different PM
+        */
+       mptcp_userspace_pm_free_local_addr_list(msk);
 }
 
 void mptcp_pm_data_reset(struct mptcp_sock *msk)

diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
index 945aa5afc2ddfd7f5b0bb1e6083d34c7e41b18cd..2203cc2d27485f71d630590feb5b2b8324497ac5 100644 (file)
--- a/net/mptcp/pm_userspace.c
+++ b/net/mptcp/pm_userspace.c
@@ -54,6 +54,10 @@ static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk,
        bitmap_zero(id_bitmap, MPTCP_PM_MAX_ADDR_ID + 1);
 
        spin_lock_bh(&msk->pm.lock);
+       if (msk->pm.status & BIT(MPTCP_PM_DESTROYING)) {
+               ret = -EINVAL;
+               goto append_err;
+       }
        mptcp_for_each_userspace_pm_addr(msk, e) {
                addr_match = mptcp_addresses_equal(&e->addr, &entry->addr, true);
                if (addr_match && entry->addr.id == 0 && needs_id)

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index c13680d189942d1dcb846d7190acc935f694bfe0..1b80f2d6ec5a238a27fc4c0543cf0a9caee85e69 100644 (file)
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -190,9 +190,10 @@ enum mptcp_pm_status {
        MPTCP_PM_ESTABLISHED,
        MPTCP_PM_SUBFLOW_ESTABLISHED,
        MPTCP_PM_ALREADY_ESTABLISHED,   /* persistent status, set after ESTABLISHED event */
-       MPTCP_PM_MPC_ENDPOINT_ACCOUNTED /* persistent status, set after MPC local address is
-                                        * accounted int id_avail_bitmap
-                                        */
+       MPTCP_PM_MPC_ENDPOINT_ACCOUNTED, /* persistent status, set after MPC local address is
+                                         * accounted int id_avail_bitmap
+                                         */
+       MPTCP_PM_DESTROYING,            /* To fence out PM list allocs */
 };
 
 enum mptcp_pm_type {