Commit 76c1f647 authored by Johan Hovold's avatar Johan Hovold Committed by Yi Yang
Browse files

wifi: ath11k: fix dfs radar event locking 

stable inclusion
from stable-v5.10.202
commit f882f51905517575c9f793a3dff567af90ef9a10
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9RFZY
CVE: CVE-2023-52798

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f882f51905517575c9f793a3dff567af90ef9a10



--------------------------------

commit 3b6c14833165f689cc5928574ebafe52bbce5f1e upstream.

The ath11k active pdevs are protected by RCU but the DFS radar event
handling code calling ath11k_mac_get_ar_by_pdev_id() was not marked as a
read-side critical section.

Mark the code in question as an RCU read-side critical section to avoid
any potential use-after-free issues.

Compile tested only.

Fixes: d5c65159 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
Cc: stable@vger.kernel.org      # 5.6
Acked-by: default avatarJeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20231019153115.26401-3-johan+linaro@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarYi Yang <yiyang13@huawei.com>
parent 1c37ffbb

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

+4 −0
Original line number Diff line number Diff line
@@ -6355,6 +6355,8 @@ ath11k_wmi_pdev_dfs_radar_detected_event(struct ath11k_base *ab, struct sk_buff 
		   ev->detector_id, ev->segment_id, ev->timestamp, ev->is_chirp,

		   ev->freq_offset, ev->sidx);



	rcu_read_lock();



	ar = ath11k_mac_get_ar_by_pdev_id(ab, ev->pdev_id);



	if (!ar) {
@@ -6372,6 +6374,8 @@ ath11k_wmi_pdev_dfs_radar_detected_event(struct ath11k_base *ab, struct sk_buff 
		ieee80211_radar_detected(ar->hw);



exit:

	rcu_read_unlock();



	kfree(tb);

}