From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795031129; b=2xCiRSFINIahrB3z5lWaqT37wq9N9Xu5sfQ8Pl0Lsdr2jYAQScLPkcu+Ur4AtZsmNyHn lnJIH9TJoqRLb5zaku/ffOKCxPRzHXYU52a6Cj+SiwRWW/TDLuFDViLAd6hyaUJbV7fYp cgQhqvYu1CHvCOUDDgbAFbNq9PpGS4gjho/UqAhm/mf4VhCogowWSR6IdA0QXadUTDlrn CPWVVQzDmkNZVPvwVlNTt94HadrO2KkYblixCZpQQxVFBeWyRAGO8UAfVi+bxN2sgd3Aw NqFoSFUsk/9OYX/8JLVgTx0USGdtQkgsV00maxWtVM2kMQeArE/gjlJWc8u1IdmwW4Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795031129; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=5S/REtE1tOgrGdYGi1Byl2wV6nZyGKmrChmqRVgWNlU=; b=j+PtXtNXF9dEUr5Bx+8/ybYzZF9RUjkvob8XVTGSo/nwuvUTrR881/R7/S6/cbTnizXC C1D/grW3JDy5I1+0lOLryRTwPU/tisMBRlHwGhWAQfAzpDxCL3BGcRONOP5swJnwraRhR RmhkdUST3M9FYYMwXb5Elo7WA5CpT/Iv+Yef7xEnOzpNccvI/qG2X0KYxR7SIw0M2+2hL kEG8dl8WzsAZn62xQQUdU2q3aaxB4LwJ8Dobw2Kc1A66MNX+u1574abgvCZXfWahmlzGe R2l+eVdo9pIUTHUfft7D1JKTqVolbDO99lZazcjZBh9JzlVdSxtaZL/fHYs8YPxqSFg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=Q3oFa+04; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D136C606A31C; Wed, 18 Nov 2026 19:45:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=Q3oFa+04 Received: by smtp.kernel.org (Postfix) with ESMTPSA id DB5EA1F000C8; Wed, 18 Nov 2026 19:45:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795031129; bh=5S/REtE1tOgrGdYGi1Byl2wV6nZyGKmrChmqRVgWNlU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Q3oFa+04bGAbbH0+N2gI/AF38QWfn7k6nNr6XCWdAU7P07bk+c8Oott7VSn6u6mBG myl531PWbyo7qdXWyjYEV7ltQRIuAx+qsu4Jd8d+Jbp6Luz9ZQ+6XU1iAZ7kG0h2Ta ezEuIywlsauN9fUw35WjLcM76pC+cfbAYpceekL0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Felix Fietkau , Sasha Levin Subject: [PATCH 6.12 0949/1756] wifi: mt76: mt7996: validate firmware event lengths before parsing Date: Wed, 18 Nov 2026 15:51:16 +0100 Message-ID: <20261118150047.855038328@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150007.957976754@linuxfoundation.org> References: <20261118150007.957976754@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Felix Fietkau [ Upstream commit c88f880c6430948492a4eee00d90e48fa800febf ] Two unsolicited event handlers trusted firmware-provided lengths: mt7996_mcu_rx_all_sta_info_event() looped over res->sta_num without checking it against skb->len, reading the flex array out of bounds; and mt7996_mcu_rx_log_message() could compute a negative or oversized length from tlv->len and feed it to %.*s and the debugfs log path. Bound both against the actual skb length. Fixes: adde3eed4a75 ("wifi: mt76: mt7996: Add mcu commands for getting sta tx statistic") Fixes: 98686cd21624 ("wifi: mt76: mt7996: add driver for MediaTek Wi-Fi 7 (802.11be) devices") Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- .../net/wireless/mediatek/mt76/mt7996/mcu.c | 46 +++++++++++++++++-- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c index 991efc9977be3..a8a0737635d27 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c @@ -380,21 +380,32 @@ mt7996_mcu_rx_log_message(struct mt7996_dev *dev, struct sk_buff *skb) { #define UNI_EVENT_FW_LOG_FORMAT 0 struct mt7996_mcu_rxd *rxd = (struct mt7996_mcu_rxd *)skb->data; - const char *data = (char *)&rxd[1] + 4, *type; - struct tlv *tlv = (struct tlv *)data; + const char *data, *type; + struct tlv *tlv; int len; + if (skb->len < sizeof(*rxd)) + return; + if (!(rxd->option & MCU_UNI_CMD_EVENT)) { - len = skb->len - sizeof(*rxd); data = (char *)&rxd[1]; + len = skb->len - sizeof(*rxd); goto out; } + if (skb->len < sizeof(*rxd) + 4 + sizeof(*tlv)) + return; + + tlv = (struct tlv *)((char *)&rxd[1] + 4); if (le16_to_cpu(tlv->tag) != UNI_EVENT_FW_LOG_FORMAT) return; - data += sizeof(*tlv) + 4; + if (le16_to_cpu(tlv->len) < sizeof(*tlv) + 4) + return; + + data = (char *)tlv + sizeof(*tlv) + 4; len = le16_to_cpu(tlv->len) - sizeof(*tlv) - 4; + len = min_t(int, len, skb->len - (int)(data - (char *)skb->data)); out: switch (rxd->s2d_index) { @@ -507,13 +518,38 @@ static void mt7996_mcu_rx_all_sta_info_event(struct mt7996_dev *dev, struct sk_buff *skb) { struct mt7996_mcu_all_sta_info_event *res; + u32 elem_size; + u16 sta_num; u16 i; + if (skb->len < sizeof(struct mt7996_mcu_rxd)) + return; + skb_pull(skb, sizeof(struct mt7996_mcu_rxd)); res = (struct mt7996_mcu_all_sta_info_event *)skb->data; + if (skb->len < sizeof(*res)) + return; + + sta_num = le16_to_cpu(res->sta_num); + switch (le16_to_cpu(res->tag)) { + case UNI_ALL_STA_TXRX_RATE: + elem_size = sizeof(res->rate[0]); + break; + case UNI_ALL_STA_TXRX_ADM_STAT: + elem_size = sizeof(res->adm_stat[0]); + break; + case UNI_ALL_STA_TXRX_MSDU_COUNT: + elem_size = sizeof(res->msdu_cnt[0]); + break; + default: + return; + } + + if (sta_num > (skb->len - sizeof(*res)) / elem_size) + sta_num = (skb->len - sizeof(*res)) / elem_size; - for (i = 0; i < le16_to_cpu(res->sta_num); i++) { + for (i = 0; i < sta_num; i++) { u8 ac; u16 wlan_idx; struct mt76_wcid *wcid; -- 2.53.0