summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaradhana Sahu <quic_aarasahu@quicinc.com>2024-06-11 06:10:16 +0300
committerKalle Valo <quic_kvalo@quicinc.com>2024-06-19 17:00:51 +0300
commit59ca26c9a6e844204d25299774caa5441c0e68eb (patch)
tree11f41d4fd8838b74a8d23bd493286a92b66dad95
parentaadeee47e9d7ae98f7116f63fa63fcceffffc65c (diff)
downloadlinux-59ca26c9a6e844204d25299774caa5441c0e68eb.tar.xz
wifi: ath12k: fix NULL pointer access in ath12k_mac_op_get_survey()
Smatch throws below error drivers/net/wireless/ath/ath12k/mac.c:8318 ath12k_mac_op_get_survey() error: we previously assumed 'sband' could be null Currently, we access sband inside the null check of the sband in ath12k_mac_op_get_survey(). Fix this issue by removing the entire if block, because decrement idx is unnecessary since there are no more band to test. Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 Fixes: 70e3be54bbdd ("wifi: ath12k: fix survey dump collection in 6 GHz") Signed-off-by: Aaradhana Sahu <quic_aarasahu@quicinc.com> Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> Link: https://patch.msgid.link/20240611031017.297927-2-quic_aarasahu@quicinc.com
-rw-r--r--drivers/net/wireless/ath/ath12k/mac.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index bc2da8530651..00a158c22971 100644
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -8291,10 +8291,6 @@ static int ath12k_mac_op_get_survey(struct ieee80211_hw *hw, int idx,
if (!sband)
sband = hw->wiphy->bands[NL80211_BAND_6GHZ];
- if (!sband || idx >= sband->n_channels) {
- idx -= sband->n_channels;
- sband = NULL;
- }
if (!sband || idx >= sband->n_channels)
return -ENOENT;