From: Jiale Yao <yaojiale02@163.com>
To: Felix Fietkau <nbd@nbd.name>,
Lorenzo Bianconi <lorenzo@kernel.org>,
Ryder Lee <ryder.lee@mediatek.com>,
Shayne Chen <shayne.chen@mediatek.com>,
Sean Wang <sean.wang@mediatek.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>,
Peter Chiu <chui-hao.chiu@mediatek.com>,
linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org
Cc: Jiale Yao <yaojiale02@163.com>
Subject: [PATCH 09/10] wifi: mt76: mt7915: validate WED TX statistics response
Date: Mon, 19 Oct 2026 18:15:04 +0800 [thread overview]
Message-ID: <20261019101506.1926943-10-yaojiale02@163.com> (raw)
In-Reply-To: <20261019101506.1926943-1-yaojiale02@163.com>
The WED statistics query optionally skips a response prefix and then
reads a fixed statistics structure without validating either range. A
truncated firmware response can cause out-of-bounds reads.
Calculate the chip-specific prefix and require the complete response
before pulling the prefix.
Fixes: 161a7528e407 ("wifi: mt76: mt7915: rework tx packets counting when WED is active")
Signed-off-by: Jiale Yao <yaojiale02@163.com>
---
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index 00a528694255..4a11a4a0dbde 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -4183,7 +4183,7 @@ int mt7915_mcu_wed_wa_tx_stats(struct mt7915_dev *dev, u16 wlan_idx)
} __packed *res;
struct mt76_wcid *wcid;
struct sk_buff *skb;
- int ret, len;
+ int ret, len, offset;
u16 ret_wcid;
if (is_mt7915(&dev->mt76)) {
@@ -4200,8 +4200,13 @@ int mt7915_mcu_wed_wa_tx_stats(struct mt7915_dev *dev, u16 wlan_idx)
if (ret)
return ret;
- if (!is_mt7915(&dev->mt76))
- skb_pull(skb, 4);
+ offset = is_mt7915(&dev->mt76) ? 0 : 4;
+ if (skb->len < offset + sizeof(*res)) {
+ dev_kfree_skb(skb);
+ return -EINVAL;
+ }
+
+ skb_pull(skb, offset);
res = (struct mt7915_mcu_wa_tx_stat *)skb->data;
--
2.34.1
next prev parent reply other threads:[~2026-10-19 10:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-19 10:14 [PATCH 00/10] wifi: mt76: validate legacy MCU responses Jiale Yao
2026-10-19 10:14 ` [PATCH 01/10] wifi: mt76: mt7603: validate MCU response length Jiale Yao
2026-10-19 10:14 ` [PATCH 02/10] wifi: mt76: mt7615: validate MCU response lengths Jiale Yao
2026-10-19 10:14 ` [PATCH 03/10] wifi: mt76: mt7915: " Jiale Yao
2026-10-19 10:14 ` [PATCH 04/10] wifi: mt76: mt7915: validate MURU statistics response Jiale Yao
2026-10-19 10:15 ` [PATCH 05/10] wifi: mt76: mt7915: validate EEPROM response length Jiale Yao
2026-10-19 10:15 ` [PATCH 06/10] wifi: mt76: mt7915: validate free-block " Jiale Yao
2026-10-19 10:15 ` [PATCH 07/10] wifi: mt76: mt7915: validate channel MIB " Jiale Yao
2026-10-19 10:15 ` [PATCH 08/10] wifi: mt76: mt7915: validate RX rate " Jiale Yao
2026-10-19 10:15 ` Jiale Yao [this message]
2026-10-20 2:23 ` [PATCH 10/10] wifi: mt76: mt7915: validate RF register " Jiale Yao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261019101506.1926943-10-yaojiale02@163.com \
--to=yaojiale02@163.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=chui-hao.chiu@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=lorenzo@kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=nbd@nbd.name \
--cc=ryder.lee@mediatek.com \
--cc=sean.wang@mediatek.com \
--cc=shayne.chen@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®