mt76: fix possible out-of-bound access in mt7615_fill_txs/mt7603_fill_txs

Fix possible out-of-bound access of status rates array in
mt7615_fill_txs/mt7603_fill_txs routines

Fixes: c5211e997eca ("mt76: mt7603: rework and fix tx status reporting")
Fixes: 4af81f02b49c ("mt76: mt7615: sync with mt7603 rate control changes")
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
index 1497d5ec649eea99f24119c7549e06414bd988ca..812d081ad943f202c6a9380a50440a16efcb5c83 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
@@ -1136,8 +1136,10 @@ mt7603_fill_txs(struct mt7603_dev *dev, struct mt7603_sta *sta,
                if (idx && (cur_rate->idx != info->status.rates[i].idx ||
                            cur_rate->flags != info->status.rates[i].flags)) {
                        i++;
-                       if (i == ARRAY_SIZE(info->status.rates))
+                       if (i == ARRAY_SIZE(info->status.rates)) {
+                               i--;
                                break;
+                       }
 
                        info->status.rates[i] = *cur_rate;
                        info->status.rates[i].count = 0;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
index 2b810ba359ae51c82dd29c32176b04fa8fe529aa..c77adc5d255259308fa43981e1364e466411b908 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -1039,8 +1039,10 @@ static bool mt7615_fill_txs(struct mt7615_dev *dev, struct mt7615_sta *sta,
                if (idx && (cur_rate->idx != info->status.rates[i].idx ||
                            cur_rate->flags != info->status.rates[i].flags)) {
                        i++;
-                       if (i == ARRAY_SIZE(info->status.rates))
+                       if (i == ARRAY_SIZE(info->status.rates)) {
+                               i--;
                                break;
+                       }
 
                        info->status.rates[i] = *cur_rate;
                        info->status.rates[i].count = 0;