]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
wifi: mt76: fix coverity overrun-call in mt76_get_txpower()
authorDeren Wu <deren.wu@mediatek.com>
Sun, 27 Nov 2022 02:35:37 +0000 (10:35 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 31 Dec 2022 12:32:21 +0000 (13:32 +0100)
[ Upstream commit 03dd0d49de7db680a856fa566963bb8421f46368 ]

Make sure the nss is valid for nss_delta array. Return zero
if the index is invalid.

Coverity message:
Event overrun-call: Overrunning callee's array of size 4 by passing
argument "n_chains" (which evaluates to 15) in call to
"mt76_tx_power_nss_delta".
int delta = mt76_tx_power_nss_delta(n_chains);

Fixes: 07cda406308b ("mt76: fix rounding issues on converting per-chain and combined txpower")
Signed-off-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/mediatek/mt76/mt76.h

index 87db9498dea44a517ad9cfd0c17f7c90303427fb..7bcf7a6b67df3cf2d053053a3f8830b7e83358af 100644 (file)
@@ -1107,8 +1107,9 @@ static inline bool mt76_is_skb_pktid(u8 pktid)
 static inline u8 mt76_tx_power_nss_delta(u8 nss)
 {
        static const u8 nss_delta[4] = { 0, 6, 9, 12 };
+       u8 idx = nss - 1;
 
-       return nss_delta[nss - 1];
+       return (idx < ARRAY_SIZE(nss_delta)) ? nss_delta[idx] : 0;
 }
 
 static inline bool mt76_testmode_enabled(struct mt76_phy *phy)