Skip to content

Commit 1a5352a

Browse files
jhovoldkvalo
authored andcommitted
wifi: ath11k: fix temperature event locking
The ath11k active pdevs are protected by RCU but the temperature event handling code calling ath11k_mac_get_ar_by_pdev_id() was not marked as a read-side critical section as reported by RCU lockdep: ============================= WARNING: suspicious RCU usage 6.6.0-rc6 #7 Not tainted ----------------------------- drivers/net/wireless/ath/ath11k/mac.c:638 suspicious rcu_dereference_check() usage! other info that might help us debug this: rcu_scheduler_active = 2, debug_locks = 1 no locks held by swapper/0/0. ... Call trace: ... lockdep_rcu_suspicious+0x16c/0x22c ath11k_mac_get_ar_by_pdev_id+0x194/0x1b0 [ath11k] ath11k_wmi_tlv_op_rx+0xa84/0x2c1c [ath11k] ath11k_htc_rx_completion_handler+0x388/0x510 [ath11k] Mark the code in question as an RCU read-side critical section to avoid any potential use-after-free issues. Tested-on: WCN6855 hw2.1 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23 Fixes: a41d103 ("ath11k: add thermal sensor device support") Cc: [email protected] # 5.7 Signed-off-by: Johan Hovold <[email protected]> Acked-by: Jeff Johnson <[email protected]> Signed-off-by: Kalle Valo <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent cda8607 commit 1a5352a

File tree

1 file changed

+6
-2
lines changed
  • drivers/net/wireless/ath/ath11k

1 file changed

+6
-2
lines changed

drivers/net/wireless/ath/ath11k/wmi.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8382,15 +8382,19 @@ ath11k_wmi_pdev_temperature_event(struct ath11k_base *ab,
83828382
ath11k_dbg(ab, ATH11K_DBG_WMI, "event pdev temperature ev temp %d pdev_id %d\n",
83838383
ev->temp, ev->pdev_id);
83848384

8385+
rcu_read_lock();
8386+
83858387
ar = ath11k_mac_get_ar_by_pdev_id(ab, ev->pdev_id);
83868388
if (!ar) {
83878389
ath11k_warn(ab, "invalid pdev id in pdev temperature ev %d", ev->pdev_id);
8388-
kfree(tb);
8389-
return;
8390+
goto exit;
83908391
}
83918392

83928393
ath11k_thermal_event_temperature(ar, ev->temp);
83938394

8395+
exit:
8396+
rcu_read_unlock();
8397+
83948398
kfree(tb);
83958399
}
83968400

0 commit comments

Comments
 (0)