]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
wifi: mt76: mt7925: fix off by one in mt7925_mcu_hw_scan()
authorDan Carpenter <dan.carpenter@linaro.org>
Tue, 27 May 2025 05:55:38 +0000 (08:55 +0300)
committerFelix Fietkau <nbd@nbd.name>
Thu, 3 Jul 2025 17:26:53 +0000 (19:26 +0200)
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>
drivers/net/wireless/mediatek/mt76/mt7925/mcu.c

index b8542be0d94565b51ac3575b5e0dff9d2650f167..16f3cc58a192ef9968315231b6a486e776eb12fa 100644 (file)
@@ -2866,7 +2866,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[i].ssid_len = cpu_to_le32(sreq->ssids[i].ssid_len);
@@ -2883,7 +2883,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,