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>,
StanleyYP Wang <StanleyYP.Wang@mediatek.com>,
Evelyn Tsai <evelyn.tsai@mediatek.com>,
Bo Jiao <Bo.Jiao@mediatek.com>,
Elwin Huang <s09289728096@gmail.com>,
linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org
Subject: [PATCH 3/7] wifi: mt76: mt7996: validate EEPROM response lengths
Date: Tue, 20 Oct 2026 10:49:29 +0800 [thread overview]
Message-ID: <20261020024933.3205681-4-yaojiale02@163.com> (raw)
In-Reply-To: <20261020024933.3205681-1-yaojiale02@163.com>
The EEPROM query reads fixed event fields and copies EFUSE or external
EEPROM data without checking the firmware response length. A truncated
response or an oversized external data length can cause out-of-bounds
reads.
Validate the fixed event, the requested EFUSE bytes, and both the
external data-length field and its payload before copying data.
Fixes: 98686cd21624 ("wifi: mt76: mt7996: add driver for MediaTek Wi-Fi 7 (802.11be) devices")
Fixes: f456e1f56c4c ("wifi: mt76: add external EEPROM support for mt799x chipsets")
Signed-off-by: Jiale Yao <yaojiale02@163.com>
---
.../net/wireless/mediatek/mt76/mt7996/mcu.c | 30 +++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
index 1f7af6359dd7..eb868c2d5108 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
@@ -4399,6 +4399,7 @@ int mt7996_mcu_get_eeprom(struct mt7996_dev *dev, u32 offset, u8 *buf, u32 buf_l
};
struct mt7996_mcu_eeprom_access_event *event;
struct sk_buff *skb;
+ size_t data_offset;
int ret, cmd;
u32 addr;
@@ -4424,9 +4425,14 @@ int mt7996_mcu_get_eeprom(struct mt7996_dev *dev, u32 offset, u8 *buf, u32 buf_l
if (ret)
return ret;
+ data_offset = offsetof(struct mt7996_mcu_eeprom_access_event, eeprom);
+ if (skb->len < data_offset) {
+ ret = -EINVAL;
+ goto out;
+ }
+
event = (struct mt7996_mcu_eeprom_access_event *)skb->data;
if (event->valid) {
- u32 ret_len = le32_to_cpu(event->eeprom.ext_eeprom.data_len);
u32 block = mode == EEPROM_MODE_EXT ? MT7996_EXT_EEPROM_BLOCK_SIZE :
MT7996_EEPROM_BLOCK_SIZE;
@@ -4444,16 +4450,35 @@ int mt7996_mcu_get_eeprom(struct mt7996_dev *dev, u32 offset, u8 *buf, u32 buf_l
case EEPROM_MODE_EFUSE:
if (!buf_len || buf_len > MT7996_EEPROM_BLOCK_SIZE)
buf_len = MT7996_EEPROM_BLOCK_SIZE;
+ if (skb->len - data_offset < buf_len) {
+ ret = -EINVAL;
+ break;
+ }
memcpy(buf, event->eeprom.efuse, buf_len);
break;
- case EEPROM_MODE_EXT:
+ case EEPROM_MODE_EXT: {
+ u32 ret_len;
+
+ if (skb->len - data_offset < sizeof(__le32)) {
+ ret = -EINVAL;
+ break;
+ }
+
+ ret_len = le32_to_cpu(event->eeprom.ext_eeprom.data_len);
+ data_offset += sizeof(__le32);
+ if (ret_len > skb->len - data_offset) {
+ ret = -EINVAL;
+ break;
+ }
+
if (!buf_len || buf_len > MT7996_EXT_EEPROM_BLOCK_SIZE)
buf_len = MT7996_EXT_EEPROM_BLOCK_SIZE;
memcpy(buf, event->eeprom.ext_eeprom.data,
ret_len < buf_len ? ret_len : buf_len);
break;
+ }
default:
ret = -EINVAL;
break;
@@ -4462,6 +4487,7 @@ int mt7996_mcu_get_eeprom(struct mt7996_dev *dev, u32 offset, u8 *buf, u32 buf_l
ret = -EINVAL;
}
+out:
dev_kfree_skb(skb);
return ret;
--
2.34.1
next prev parent reply other threads:[~2026-10-20 2:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-20 2:49 [PATCH 0/7] wifi: mt76: validate mt7996 MCU responses Jiale Yao
2026-10-20 2:49 ` [PATCH 1/7] wifi: mt76: mt7996: validate MCU response lengths Jiale Yao
2026-10-20 2:49 ` [PATCH 2/7] wifi: mt76: mt7996: bound IE countdown event parsing Jiale Yao
2026-10-20 2:49 ` Jiale Yao [this message]
2026-10-20 2:49 ` [PATCH 4/7] wifi: mt76: mt7996: validate free-block response length Jiale Yao
2026-10-20 2:49 ` [PATCH 5/7] wifi: mt76: mt7996: validate channel MIB " Jiale Yao
2026-10-20 2:49 ` [PATCH 6/7] wifi: mt76: mt7996: validate temperature " Jiale Yao
2026-10-20 2:49 ` [PATCH 7/7] wifi: mt76: mt7996: 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=20261020024933.3205681-4-yaojiale02@163.com \
--to=yaojiale02@163.com \
--cc=Bo.Jiao@mediatek.com \
--cc=StanleyYP.Wang@mediatek.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=evelyn.tsai@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=s09289728096@gmail.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®