wifi: mt76: mt7925: fix off by one in mt7925_mcu_hw_scan()

[ Upstream commit b3a431fe2e399b2e0cc5f43f7e9d63d63d3710ee ]

The ssid->ssids[] and sreq->ssids[] arrays have MT7925_RNR_SCAN_MAX_BSSIDS
elements so this >= needs to be > to prevent an out of bounds access.

Fixes: 8284815ca161 ("wifi: mt76: mt7925: add RNR scan support for 6GHz")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Link: https://patch.msgid.link/aDVT2tPhG_8T0Qla@stanley.mountain
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
index 8ac6fbb736ab87de6a1486b98de87a2001b7d752..300c863f0e3e2017c3ad36dca57fadcda302a9b1 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
@@ -2916,7 +2916,7 @@ int mt7925_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif,
        for (i = 0; i < sreq->n_ssids; i++) {
                if (!sreq->ssids[i].ssid_len)
                        continue;
-               if (i > MT7925_RNR_SCAN_MAX_BSSIDS)
+               if (i >= MT7925_RNR_SCAN_MAX_BSSIDS)
                        break;
 
                ssid->ssids[n_ssids].ssid_len = cpu_to_le32(sreq->ssids[i].ssid_len);
@@ -2933,7 +2933,7 @@ int mt7925_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif,
                mt76_connac_mcu_build_rnr_scan_param(mdev, sreq);
 
                for (j = 0; j < mdev->rnr.bssid_num; j++) {
-                       if (j > MT7925_RNR_SCAN_MAX_BSSIDS)
+                       if (j >= MT7925_RNR_SCAN_MAX_BSSIDS)
                                break;
 
                        tlv = mt76_connac_mcu_add_tlv(skb, UNI_SCAN_BSSID,