Commit 6eff0646 authored by Johan Hovold's avatar Johan Hovold Committed by Yi Yang
Browse files

wifi: ath11k: fix htt pktlog locking 

stable inclusion
from stable-v5.10.202
commit 03ed26935bebf6b6fd8a656490bf3dcc71b72679
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9RKHK
CVE: CVE-2023-52800

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



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

commit 3f77c7d605b29df277d77e9ee75d96e7ad145d2d upstream.

The ath11k active pdevs are protected by RCU but the htt pktlog 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
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/20231019112521.2071-1-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/dp_rx.c

+7 −1
Original line number Diff line number Diff line
@@ -1578,14 +1578,20 @@ static void ath11k_htt_pktlog(struct ath11k_base *ab, struct sk_buff *skb) 
	u8 pdev_id;



	pdev_id = FIELD_GET(HTT_T2H_PPDU_STATS_INFO_PDEV_ID, data->hdr);



	rcu_read_lock();



	ar = ath11k_mac_get_ar_by_pdev_id(ab, pdev_id);

	if (!ar) {

		ath11k_warn(ab, "invalid pdev id %d on htt pktlog\n", pdev_id);

		return;

		goto out;

	}



	trace_ath11k_htt_pktlog(ar, data->payload, hdr->size,

				ar->ab->pktlog_defs_checksum);



out:

	rcu_read_unlock();

}



static void ath11k_htt_backpressure_event_handler(struct ath11k_base *ab,