]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: ath6kl: fix use-after-free in aggr_reset_state()
authorDaniel Hodges <git@danielhodges.dev>
Fri, 6 Feb 2026 18:52:07 +0000 (13:52 -0500)
committerJeff Johnson <jeff.johnson@oss.qualcomm.com>
Thu, 2 Jul 2026 21:05:00 +0000 (14:05 -0700)
The aggr_reset_state() function uses timer_delete() (non-synchronous)
for the aggregation timer before proceeding to delete TID state and
before the structure is freed by callers like aggr_module_destroy().

If the timer callback (aggr_timeout) is executing when aggr_reset_state()
is called, the callback will continue to access aggr_conn fields like
rx_tid[] and stat[] which may be freed immediately after by
kfree(aggr_info->aggr_conn) in aggr_module_destroy().

Additionally, the timer callback can re-arm itself via mod_timer() while
aggr_reset_state() is running, creating a more complex race condition.

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

Fixes: bdcd81707973 ("Add ath6kl cleaned up driver")
Cc: stable@vger.kernel.org
Signed-off-by: Daniel Hodges <git@danielhodges.dev>
Reviewed-by: Vasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>
Link: https://patch.msgid.link/20260206185207.30098-1-git@danielhodges.dev
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
drivers/net/wireless/ath/ath6kl/txrx.c

index 97fdac7237e26ecec4571817eb8c212560cb7f90..0e268017af528228b881bd9ab753e5dbadfd1962 100644 (file)
@@ -1828,7 +1828,7 @@ void aggr_reset_state(struct aggr_info_conn *aggr_conn)
                return;
 
        if (aggr_conn->timer_scheduled) {
-               timer_delete(&aggr_conn->timer);
+               timer_delete_sync(&aggr_conn->timer);
                aggr_conn->timer_scheduled = false;
        }