]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: ath10k: sdio: add missing lock protection in ath10k_sdio_fw_crashed_dump()
authorZiyi Guo <n7l8m4@u.northwestern.edu>
Fri, 23 Jan 2026 04:58:22 +0000 (04:58 +0000)
committerJeff Johnson <jeff.johnson@oss.qualcomm.com>
Fri, 30 Jan 2026 15:12:37 +0000 (07:12 -0800)
ath10k_sdio_fw_crashed_dump() calls ath10k_coredump_new() which requires
ar->dump_mutex to be held, as indicated by lockdep_assert_held() in that
function. However, the SDIO implementation does not acquire this lock,
unlike the PCI and SNOC implementations which properly hold the mutex.

Additionally, ar->stats.fw_crash_counter is documented as protected by
ar->data_lock in core.h, but the SDIO implementation modifies it without
holding this spinlock.

Add the missing mutex_lock()/mutex_unlock() around the coredump
operations, and add spin_lock_bh()/spin_unlock_bh() around the
fw_crash_counter increment, following the pattern used in
ath10k_pci_fw_dump_work() and ath10k_snoc_fw_crashed_dump().

Fixes: 3c45f21af84e ("ath10k: sdio: add firmware coredump support")
Signed-off-by: Ziyi Guo <n7l8m4@u.northwestern.edu>
Reviewed-by: Baochen Qiang <baochen.qiang@oss.qualcomm.com>
Link: https://patch.msgid.link/20260123045822.2221549-1-n7l8m4@u.northwestern.edu
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
drivers/net/wireless/ath/ath10k/sdio.c

index c06d50db40b8185e3b5c22088b57801852810725..00d0556dafefdb42cfde1bae0f3af4979bd08a6e 100644 (file)
@@ -2487,7 +2487,11 @@ void ath10k_sdio_fw_crashed_dump(struct ath10k *ar)
        if (fast_dump)
                ath10k_bmi_start(ar);
 
+       mutex_lock(&ar->dump_mutex);
+
+       spin_lock_bh(&ar->data_lock);
        ar->stats.fw_crash_counter++;
+       spin_unlock_bh(&ar->data_lock);
 
        ath10k_sdio_disable_intrs(ar);
 
@@ -2505,6 +2509,8 @@ void ath10k_sdio_fw_crashed_dump(struct ath10k *ar)
 
        ath10k_sdio_enable_intrs(ar);
 
+       mutex_unlock(&ar->dump_mutex);
+
        ath10k_core_start_recovery(ar);
 }