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=1794063228; b=zZ7iFgxVi70LEp7E2+ln6t0CenRMJMgE+74T0d3pK6DNl35xq29zjPs4EU4kwRKilaKG WJMZEp7lSCUKuFl3MtQ+o2953Clt94palXKATyLUjUCTfQqZu4tVypSPfUwiQP/pXFFT8 VqYDqCrBfo8S2RBG5oXwtj7SJsV28XlLmpKtUDZMntb7nkuQ2W6uf6zvG1j9oLwtIg0op 7ZwxWKADI8ALAggmA/it2sJc0lUS1VTyOkVrIlGvYwsbfuxNDdZaY5Ty3YD7O1UTxPkc+ 4REvP/h6We5gub7I8wVFuIEYd45/i+NnZwcHokekz8diOQF4YQBMAemIWN3NqEeyEBg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794063228; 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=QmbO0DKOmxkf7jDCEJE2cY6twRTTUbMLGT1iUPdBgN0=; b=xHl+LtFrRomRyz37PYY6R0KTmTewiXzr1xURjFXtcXdISVLl/MwUHgLBwfmEMT1FVi1E 5o2pyulPPDg+dYpMUMbI2sr8eV++BHwAd+uu4fTUXmXQ0BrSXN6oDUheaDjPtozjsXdTI dz6IjCZgCPexu5/j9okjnqVb7oG0B3wRwZiOTtNtPR8mPVEcSlnRhff5vH6qQMtVMgcxG PrMKRkL/grfDJVDS/xF5OQwpHlsq40u6CnwmAlrilLUAgMJ6F2CeAdku/H8bXzDMX2uE7 MStYA9pGwpCIkt1GVj5MctkDgan4n5Sg6Q3wQRQ3DCSbtXOOAtJSUUkHh9+YKjIPZyA== 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=pAelcAPg; 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 C616F606D81A; Sat, 7 Nov 2026 14:53:47 +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=pAelcAPg Received: by smtp.kernel.org (Postfix) with ESMTPSA id 209741F0089F; Sat, 7 Nov 2026 14:53:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794063227; bh=QmbO0DKOmxkf7jDCEJE2cY6twRTTUbMLGT1iUPdBgN0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=pAelcAPgnXOHOgvDVeq8mDYJt5enDbyFe61OsF9NIZVxcgxqBNZKgFdxCB7vdETeZ SJQKPWGZNfy0iiIKcHix/2TQSfr8hTsJ9QzAPj0ijHqcqo2o2O6ytF4S/EvGH8ZZEe PUEZUTp0HzJ/0uGk9jlrCKC0dx8EEwkczFUEV8ec= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Devin Wittmayer , Mark Anthony Agarro , Felix Fietkau , Sasha Levin Subject: [PATCH 6.18 397/869] wifi: mt76: mt76x02: validate TX-status rate index before mac80211 handoff Date: Sat, 7 Nov 2026 08:51:19 -0500 Message-ID: <20261107134906.867207798@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107134852.069646174@linuxfoundation.org> References: <20261107134852.069646174@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mark Anthony Agarro [ Upstream commit fbd12e8dabc8a9d2e81f427906749b4cff85d641 ] mt76x02_mac_process_tx_rate() extracts the rate index straight from the hardware's raw TX-status word with no bounds check for the HT/HT_GF/VHT cases, and mt76x02_mac_fill_tx_status() ignores its return value. A stale or corrupt hardware index reaches mac80211's minstrel_ht rate control, whose per-group rate array is a fixed 10 entries (MCS_GROUP_RATES), causing an out-of-bounds write. Validate the index in mt76x02_mac_process_tx_rate() (HT: 0-31, VHT: MCS nibble 0-9) and have mt76x02_mac_fill_tx_status() bail out cleanly on failure instead of passing an invalid index through. Fixes: 7c1f88812690 ("mt76: unify send_tx_status and related helpers") Cc: stable@vger.kernel.org Tested-by: Devin Wittmayer Signed-off-by: Mark Anthony Agarro Link: https://patch.msgid.link/20260826092755.480190-1-markanthonyagarro@gmail.com Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- .../net/wireless/mediatek/mt76/mt76x02_mac.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c index 17c9782915315..eef131c05f763 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c @@ -302,10 +302,14 @@ mt76x02_mac_process_tx_rate(struct ieee80211_tx_rate *txrate, u16 rate, txrate->flags |= IEEE80211_TX_RC_GREEN_FIELD; fallthrough; case MT_PHY_TYPE_HT: + if (idx > 31) + return -EINVAL; txrate->flags |= IEEE80211_TX_RC_MCS; txrate->idx = idx; break; case MT_PHY_TYPE_VHT: + if ((idx & 0xf) > 9) + return -EINVAL; txrate->flags |= IEEE80211_TX_RC_VHT_MCS; txrate->idx = idx; break; @@ -493,18 +497,21 @@ mt76x02_mac_fill_tx_status(struct mt76x02_dev *dev, struct mt76x02_sta *msta, first_rate = st->rate & ~MT_PKTID_RATE; first_rate |= st->pktid & MT_PKTID_RATE; - mt76x02_mac_process_tx_rate(&rate[0], first_rate, - dev->mphy.chandef.chan->band); + if (mt76x02_mac_process_tx_rate(&rate[0], first_rate, + dev->mphy.chandef.chan->band)) + return; } else if (rate[0].idx < 0) { if (!msta) return; - mt76x02_mac_process_tx_rate(&rate[0], msta->wcid.tx_info, - dev->mphy.chandef.chan->band); + if (mt76x02_mac_process_tx_rate(&rate[0], msta->wcid.tx_info, + dev->mphy.chandef.chan->band)) + return; } - mt76x02_mac_process_tx_rate(&last_rate, st->rate, - dev->mphy.chandef.chan->band); + if (mt76x02_mac_process_tx_rate(&last_rate, st->rate, + dev->mphy.chandef.chan->band)) + return; for (i = 0; i < ARRAY_SIZE(info->status.rates); i++) { retry--; -- 2.53.0