From: Aviel Zohar <avielzohar123@gmail.com>
To: linux-wireless@vger.kernel.org
Cc: linux-mediatek@lists.infradead.org, nbd@nbd.name,
lorenzo@kernel.org, sean.wang@mediatek.com,
ryder.lee@mediatek.com, Aviel Zohar <avielzohar123@gmail.com>
Subject: [PATCH 2/2] wifi: mt76: mt7915: validate skb length in txpower SKU query
Date: Mon, 13 Apr 2026 06:31:35 +0300 [thread overview]
Message-ID: <20260413033136.5417-3-avielzohar123@gmail.com> (raw)
In-Reply-To: <20260413033136.5417-1-avielzohar123@gmail.com>
In mt7915_mcu_get_txpower_sku(), the response skb from
mt76_mcu_send_and_get_msg() is used in memcpy without validating
its length:
For TX_POWER_INFO_RATE:
memcpy(res, skb->data + 4, sizeof(res));
where sizeof(res) is MT7915_SKU_RATE_NUM * 2 = 322 bytes.
For TX_POWER_INFO_PATH:
memcpy(txpower, skb->data + 4, len);
In both cases, if the firmware returns a response shorter than
the expected size, the memcpy reads beyond the skb data buffer.
The data surfaces to userspace via debugfs (txpower_sku and
txpower_path).
Add length checks for both code paths before the memcpy.
Signed-off-by: Aviel Zohar <avielzohar123@gmail.com>
---
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 8 ++++++++
1 file changed, 8 insertions(+)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -3532,10 +3532,18 @@
if (category == TX_POWER_INFO_RATE) {
s8 res[MT7915_SKU_RATE_NUM][2];
+ if (skb->len < sizeof(res) + 4) {
+ dev_kfree_skb(skb);
+ return -EINVAL;
+ }
memcpy(res, skb->data + 4, sizeof(res));
for (i = 0; i < len; i++)
txpower[i] = res[i][req.band_idx];
} else if (category == TX_POWER_INFO_PATH) {
+ if (skb->len < len + 4) {
+ dev_kfree_skb(skb);
+ return -EINVAL;
+ }
memcpy(txpower, skb->data + 4, len);
}
prev parent reply other threads:[~2026-04-13 3:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-13 3:31 [PATCH 0/2] wifi: mt76: add missing skb length validation Aviel Zohar
2026-04-13 3:31 ` [PATCH 1/2] wifi: mt76: mt7925: validate skb length in testmode query Aviel Zohar
2026-04-13 3:31 ` Aviel Zohar [this message]
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=20260413033136.5417-3-avielzohar123@gmail.com \
--to=avielzohar123@gmail.com \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=lorenzo@kernel.org \
--cc=nbd@nbd.name \
--cc=ryder.lee@mediatek.com \
--cc=sean.wang@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