]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
wifi: mwifiex: fix use-after-free in mwifiex_adapter_cleanup()
authorDaniel Hodges <git@danielhodges.dev>
Fri, 6 Feb 2026 19:44:01 +0000 (14:44 -0500)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 2 Mar 2026 08:11:00 +0000 (09:11 +0100)
The mwifiex_adapter_cleanup() function uses timer_delete()
(non-synchronous) for the wakeup_timer before the adapter structure is
freed. This is incorrect because timer_delete() does not wait for any
running timer callback to complete.

If the wakeup_timer callback (wakeup_timer_fn) is executing when
mwifiex_adapter_cleanup() is called, the callback will continue to
access adapter fields (adapter->hw_status, adapter->if_ops.card_reset,
etc.) which may be freed by mwifiex_free_adapter() called later in the
mwifiex_remove_card() path.

Use timer_delete_sync() instead to ensure any running timer callback has
completed before returning.

Fixes: 4636187da60b ("mwifiex: add wakeup timer based recovery mechanism")
Cc: stable@vger.kernel.org
Signed-off-by: Daniel Hodges <git@danielhodges.dev>
Link: https://patch.msgid.link/20260206194401.2346-1-git@danielhodges.dev
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/marvell/mwifiex/init.c

index 5c9a46e64d23c63964e220e222dca7a3044d0061..0c892501372480b70182689ccd835149ff666be2 100644 (file)
@@ -391,7 +391,7 @@ static void mwifiex_invalidate_lists(struct mwifiex_adapter *adapter)
 static void
 mwifiex_adapter_cleanup(struct mwifiex_adapter *adapter)
 {
-       timer_delete(&adapter->wakeup_timer);
+       timer_delete_sync(&adapter->wakeup_timer);
        cancel_delayed_work_sync(&adapter->devdump_work);
        mwifiex_cancel_all_pending_cmd(adapter);
        wake_up_interruptible(&adapter->cmd_wait_q.wait);