Commit b3a431fe authored by Dan Carpenter's avatar Dan Carpenter Committed by Felix Fietkau
Browse files

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: 8284815c ("wifi: mt76: mt7925: add RNR scan support for 6GHz")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Link: https://patch.msgid.link/aDVT2tPhG_8T0Qla@stanley.mountain


Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent ac9c50c7

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

+2 −2
Original line number Diff line number Diff line
@@ -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,