wifi: mt76: fix potential tx_retries underflow
Subsystems (2)
Ryder Lee
maintainerPATCH 1/1 wifi: mt76: fix potential tx_retries underflow
When FIELD_GET returns 0 for the retry count, subtracting 1 causes an unsigned integer underflow, resulting in tx_retries becoming a very large value (0xFFFFFFFF for u32 or 255 for u8).
Fix by checking if count is non-zero before subtracting 1.
--- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 10 +++++----- drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 5 +++-- drivers/net/wireless/mediatek/mt76/mt7925/mac.c | 5 +++-- drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 6 +++--- 4 files changed, 14 insertions(+), 12 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +5 -5
@@ -912,16 +912,16 @@ mt7915_mac_tx_free(struct mt7915_dev *dev, void *data, int len) }if (!mtk_wed_device_active (&mdev->mmio.wed) && wcid) { -u32 tx_retries =0 , tx_failed =0 ; +u32 tx_retries =0 , tx_failed =0 , count;if (v3 && (info &MT_TX_FREE_MPDU_HEADER_V3 )) { - tx_retries = -FIELD_GET (MT_TX_FREE_COUNT_V3 , info) -1 ; + count =FIELD_GET (MT_TX_FREE_COUNT_V3 , info); + tx_retries = count ? count -1 :0 ; tx_failed = tx_retries + !!FIELD_GET (MT_TX_FREE_STAT_V3 , info); }else if (!v3 && (info &MT_TX_FREE_MPDU_HEADER )) { - tx_retries = -FIELD_GET (MT_TX_FREE_COUNT , info) -1 ; + count =FIELD_GET (MT_TX_FREE_COUNT , info); + tx_retries = count ? count -1 :0 ; tx_failed = tx_retries + !!FIELD_GET (MT_TX_FREE_STAT , info); }
drivers/net/wireless/mediatek/mt76/mt7921/mac.c +3 -2
@@ -530,8 +530,9 @@ static void mt7921_mac_tx_free(struct mt792x_dev *dev, void *data, int len) stat =FIELD_GET (MT_TX_FREE_STATUS , info);if (wcid) { - wcid->stats.tx_retries += -FIELD_GET (MT_TX_FREE_COUNT , info) -1 ; +u32 count =FIELD_GET (MT_TX_FREE_COUNT , info); + + wcid->stats.tx_retries += count ? count -1 :0 ; wcid->stats.tx_failed += !!stat; }
drivers/net/wireless/mediatek/mt76/mt7925/mac.c +3 -2
@@ -1141,8 +1141,9 @@ mt7925_mac_tx_free(struct mt792x_dev *dev, void *data, int len)if (info &MT_TXFREE_INFO_HEADER ) {if (wcid) { - wcid->stats.tx_retries += -FIELD_GET (MT_TXFREE_INFO_COUNT , info) -1 ; +u32 count =FIELD_GET (MT_TXFREE_INFO_COUNT , info); + + wcid->stats.tx_retries += count ? count -1 :0 ; wcid->stats.tx_failed += !!FIELD_GET (MT_TXFREE_INFO_STAT , info); }
drivers/net/wireless/mediatek/mt76/mt7996/mac.c +3 -3
@@ -1361,13 +1361,13 @@ mt7996_mac_tx_free(struct mt7996_dev *dev, void *data, int len) cur_info++;continue ; }else if (info &MT_TXFREE_INFO_HEADER ) { -u32 tx_retries =0 , tx_failed =0 ; +u32 tx_retries =0 , tx_failed =0 , count;if (!wcid)continue ; - tx_retries = -FIELD_GET (MT_TXFREE_INFO_COUNT , info) -1 ; + count =FIELD_GET (MT_TXFREE_INFO_COUNT , info); + tx_retries = count ? count -1 :0 ; tx_failed = tx_retries + !!FIELD_GET (MT_TXFREE_INFO_STAT , info);
Signature · 1 line
2.45.2
Lorenzo Bianconi
maintainerQuoted 7 lines
When
FIELD_GETreturns 0 for the retry count, subtracting 1 causes an unsigned integer underflow, resulting intx_retriesbecoming a very large value (0xFFFFFFFFfor u32 or 255 for u8).Fix by checking if count is non-zero before subtracting 1.
Signed-off-by Ryder Lee <[email protected]>
I guess we need proper Fixes tags here. Moreover, if you split this patch in three separated patches you will make life easier for guys that do backports :)
Quoted 13 lines
--- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 10 +++++----- drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 5 +++-- drivers/net/wireless/mediatek/mt76/mt7925/mac.c | 5 +++-- drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 6 +++--- 4 files changed, 14 insertions(+), 12 deletions(-)drivers/net/wireless/mediatek/mt76/mt7915/mac.c +0
-0@@ -912,16 +912,16 @@ mt7915_mac_tx_free(struct mt7915_dev *dev, void *data, int len) }
drivers/net/wireless/mediatek/mt76/mt7915/mac.c mt7915_mac_tx_free(struct mt7915_dev *dev, void *data, int len) · line 919
Quoted 10 lines
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +3
-3if (!mtk_wed_device_active (&mdev->mmio.wed) && wcid) { -u32 tx_retries =0 , tx_failed =0 ; +u32 tx_retries =0 , tx_failed =0 , count;if (v3 && (info &MT_TX_FREE_MPDU_HEADER_V3 )) { - tx_retries = -FIELD_GET (MT_TX_FREE_COUNT_V3 , info) -1 ; + count =FIELD_GET (MT_TX_FREE_COUNT_V3 , info); + tx_retries = count ? count -1 :0 ;
nit: I think it is more readable if you use a int for tx_retries and do something like:
tx_retries = max_t(int, tx_retries, 0);
This is valid even for below chunks.
Regards,
Lorenzo
Quoted 67 lines
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +2
-2tx_failed = tx_retries + !!FIELD_GET (MT_TX_FREE_STAT_V3 , info); }else if (!v3 && (info &MT_TX_FREE_MPDU_HEADER )) { - tx_retries = -FIELD_GET (MT_TX_FREE_COUNT , info) -1 ; + count =FIELD_GET (MT_TX_FREE_COUNT , info); + tx_retries = count ? count -1 :0 ; tx_failed = tx_retries + !!FIELD_GET (MT_TX_FREE_STAT , info); }drivers/net/wireless/mediatek/mt76/mt7921/mac.c +3
-2@@ -530,8 +530,9 @@ static void mt7921_mac_tx_free(struct mt792x_dev *dev, void *data, int len) stat =FIELD_GET (MT_TX_FREE_STATUS , info);if (wcid) { - wcid->stats.tx_retries += -FIELD_GET (MT_TX_FREE_COUNT , info) -1 ; +u32 count =FIELD_GET (MT_TX_FREE_COUNT , info); + + wcid->stats.tx_retries += count ? count -1 :0 ; wcid->stats.tx_failed += !!stat; }drivers/net/wireless/mediatek/mt76/mt7925/mac.c +3
-2@@ -1141,8 +1141,9 @@ mt7925_mac_tx_free(struct mt792x_dev *dev, void *data, int len)if (info &MT_TXFREE_INFO_HEADER ) {if (wcid) { - wcid->stats.tx_retries += -FIELD_GET (MT_TXFREE_INFO_COUNT , info) -1 ; +u32 count =FIELD_GET (MT_TXFREE_INFO_COUNT , info); + + wcid->stats.tx_retries += count ? count -1 :0 ; wcid->stats.tx_failed += !!FIELD_GET (MT_TXFREE_INFO_STAT , info); }drivers/net/wireless/mediatek/mt76/mt7996/mac.c +3
-3@@ -1361,13 +1361,13 @@ mt7996_mac_tx_free(struct mt7996_dev *dev, void *data, int len) cur_info++;continue ; }else if (info &MT_TXFREE_INFO_HEADER ) { -u32 tx_retries =0 , tx_failed =0 ; +u32 tx_retries =0 , tx_failed =0 , count;if (!wcid)continue ; - tx_retries = -FIELD_GET (MT_TXFREE_INFO_COUNT , info) -1 ; + count =FIELD_GET (MT_TXFREE_INFO_COUNT , info); + tx_retries = count ? count -1 :0 ; tx_failed = tx_retries + !!FIELD_GET (MT_TXFREE_INFO_STAT , info);Signature · 1 line
2.45.2