The mt7915, mt7925 and mt7996 TX-free parsers return immediately when an event ends before the advertised MSDU count is reached. If earlier entries have already released tokens, this skips the common completion path, leaking SKBs queued on the local free_list and potentially leaving TX blocked despite a pending wake request. The existing entry checks also allow a 32-bit read when only one to three bytes remain. The event headers and the mt7996 version 7 lookahead need complete-word bounds checks as well. Validate the headers before reading them and require a complete word for each entry and lookahead read. Break out of the parsing loop on a truncated entry so that the common completion path still handles the already processed entries. Found during AI-assisted code review. The extracted parsers were tested with truncated notifications under ASan/UBSan, using stubbed kernel callbacks. The issue has not been observed on hardware. Signed-off-by: Piotr Niełacny --- The full driver has not been built or tested on hardware. drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 11 ++++++++--- drivers/net/wireless/mediatek/mt76/mt7925/mac.c | 7 +++++-- drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 10 +++++++--- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c index 06cddffa..a5f4b71d 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c @@ -876,9 +876,14 @@ mt7915_mac_tx_free(struct mt7915_dev *dev, void *data, int len) void *end = data + len; bool v3, wake = false; u16 total, count = 0; - u32 txd = le32_to_cpu(free->txd); + u32 txd; __le32 *cur_info; + if (WARN_ON_ONCE(len < sizeof(*free))) + return; + + txd = le32_to_cpu(free->txd); + mt7915_mac_tx_free_prepare(dev); total = le16_get_bits(free->ctrl, MT_TX_FREE_MSDU_CNT); @@ -888,8 +893,8 @@ mt7915_mac_tx_free(struct mt7915_dev *dev, void *data, int len) u32 msdu, info; u8 i; - if (WARN_ON_ONCE((void *)cur_info >= end)) - return; + if (WARN_ON_ONCE((u8 *)end - (u8 *)cur_info < sizeof(*cur_info))) + break; /* * 1'b1: new wcid pair. diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mac.c b/drivers/net/wireless/mediatek/mt76/mt7925/mac.c index 7af996ab..309a188f 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7925/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7925/mac.c @@ -1314,6 +1314,9 @@ mt7925_mac_tx_free(struct mt792x_dev *dev, void *data, int len) bool wake = false; u16 total, count = 0; + if (WARN_ON_ONCE(len < 2 * sizeof(*tx_free))) + return; + /* clean DMA queues and unmap buffers first */ mt76_queue_tx_cleanup(dev, dev->mphy.q_tx[MT_TXQ_PSD], false); mt76_queue_tx_cleanup(dev, dev->mphy.q_tx[MT_TXQ_BE], false); @@ -1326,8 +1329,8 @@ mt7925_mac_tx_free(struct mt792x_dev *dev, void *data, int len) u32 msdu, info; u8 i; - if (WARN_ON_ONCE((void *)cur_info >= end)) - return; + if (WARN_ON_ONCE((u8 *)end - (u8 *)cur_info < sizeof(*cur_info))) + break; /* 1'b1: new wcid pair. * 1'b0: msdu_id with the same 'wcid pair' as above. */ diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c index 36776a76..f4632a6b 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c @@ -1362,6 +1362,9 @@ mt7996_mac_tx_free(struct mt7996_dev *dev, void *data, int len) u16 total, count = 0; u8 ver; + if (WARN_ON_ONCE(len < 2 * sizeof(*tx_free))) + return; + /* clean DMA queues and unmap buffers first */ mt76_queue_tx_cleanup(dev, dev->mphy.q_tx[MT_TXQ_PSD], false); mt76_queue_tx_cleanup(dev, dev->mphy.q_tx[MT_TXQ_BE], false); @@ -1383,8 +1386,8 @@ mt7996_mac_tx_free(struct mt7996_dev *dev, void *data, int len) u32 msdu, info; u8 i; - if (WARN_ON_ONCE((void *)cur_info >= end)) - return; + if (WARN_ON_ONCE((u8 *)end - (u8 *)cur_info < sizeof(*cur_info))) + break; /* 1'b1: new wcid pair. * 1'b0: msdu_id with the same 'wcid pair' as above. */ @@ -1425,7 +1428,8 @@ mt7996_mac_tx_free(struct mt7996_dev *dev, void *data, int len) } next: /* ver 7 has a new DW with pair = 1, skip it */ - if (ver == 7 && ((void *)(cur_info + 1) < end) && + if (ver == 7 && + (u8 *)end - (u8 *)cur_info >= 2 * sizeof(*cur_info) && (le32_to_cpu(*(cur_info + 1)) & MT_TXFREE_INFO_PAIR)) cur_info++; continue;