Skip to content

Commit c979768

Browse files
jhovoldsmb49
authored andcommitted
wifi: ath11k: fix temperature event locking
BugLink: https://bugs.launchpad.net/bugs/2050038 commit 1a5352a upstream. 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: stable@vger.kernel.org # 5.7 Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> Link: https://lore.kernel.org/r/20231019153115.26401-2-johan+linaro@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Portia Stephens <portia.stephens@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent 1e5df00 commit c979768

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
@@ -6855,15 +6855,19 @@ ath11k_wmi_pdev_temperature_event(struct ath11k_base *ab,
68556855
ath11k_dbg(ab, ATH11K_DBG_WMI,
68566856
"pdev temperature ev temp %d pdev_id %d\n", ev->temp, ev->pdev_id);
68576857

6858+
rcu_read_lock();
6859+
68586860
ar = ath11k_mac_get_ar_by_pdev_id(ab, ev->pdev_id);
68596861
if (!ar) {
68606862
ath11k_warn(ab, "invalid pdev id in pdev temperature ev %d", ev->pdev_id);
6861-
kfree(tb);
6862-
return;
6863+
goto exit;
68636864
}
68646865

68656866
ath11k_thermal_event_temperature(ar, ev->temp);
68666867

6868+
exit:
6869+
rcu_read_unlock();
6870+
68676871
kfree(tb);
68686872
}
68696873

0 commit comments

Comments
 (0)