diff mbox series

[1/2] wifi: ath12k: fix NULL pointer access in ath12k_mac_op_get_survey()

Message ID 20240611031017.297927-2-quic_aarasahu@quicinc.com
State New
Headers show
Series wifi: ath12k: Fix the smatch error | expand

Commit Message

Aaradhana Sahu June 11, 2024, 3:10 a.m. UTC 
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>
---
 drivers/net/wireless/ath/ath12k/mac.c | 4 ----
 1 file changed, 4 deletions(-)

Comments

Kalle Valo June 19, 2024, 2:01 p.m. UTC | #1 
Aaradhana Sahu <quic_aarasahu@quicinc.com> wrote:

> 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>

2 patches applied to ath-next branch of ath.git, thanks.

59ca26c9a6e8 wifi: ath12k: fix NULL pointer access in ath12k_mac_op_get_survey()
19b77e7c656a wifi: ath12k: fix uninitialize symbol error on ath12k_peer_assoc_h_he()
diff mbox series

Patch

diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index 509c02bffdae..4fea411545bc 100644
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -8314,10 +8314,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;