Skip to content

Commit b3a431f

Browse files
Dan Carpenternbd168
authored andcommitted
wifi: mt76: mt7925: fix off by one in mt7925_mcu_hw_scan()
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: 8284815 ("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>
1 parent ac9c50c commit b3a431f

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

  • drivers/net/wireless/mediatek/mt76/mt7925

drivers/net/wireless/mediatek/mt76/mt7925/mcu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2866,7 +2866,7 @@ int mt7925_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif,
28662866
for (i = 0; i < sreq->n_ssids; i++) {
28672867
if (!sreq->ssids[i].ssid_len)
28682868
continue;
2869-
if (i > MT7925_RNR_SCAN_MAX_BSSIDS)
2869+
if (i >= MT7925_RNR_SCAN_MAX_BSSIDS)
28702870
break;
28712871

28722872
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,
28832883
mt76_connac_mcu_build_rnr_scan_param(mdev, sreq);
28842884

28852885
for (j = 0; j < mdev->rnr.bssid_num; j++) {
2886-
if (j > MT7925_RNR_SCAN_MAX_BSSIDS)
2886+
if (j >= MT7925_RNR_SCAN_MAX_BSSIDS)
28872887
break;
28882888

28892889
tlv = mt76_connac_mcu_add_tlv(skb, UNI_SCAN_BSSID,

0 commit comments

Comments
 (0)