From f031231ff60f386c0362198bf00009b1cafb29b4 Mon Sep 17 00:00:00 2001 From: Ming Yen Hsieh Date: Fri, 27 Sep 2024 18:36:06 +0800 Subject: [PATCH] wifi: mt76: mt7925: fix a potential array-index-out-of-bounds issue for clc BugLink: https://bugs.launchpad.net/bugs/2081785 Due to the lack of checks on the clc array, if the firmware supports more clc configuration, it will cause illegal memory access. Cc: stable@vger.kernel.org Fixes: c948b5da6bbe ("wifi: mt76: mt7925: add Mediatek Wi-Fi7 driver for mt7925 chips") Signed-off-by: Ming Yen Hsieh Link: https://patch.msgid.link/20240819015334.14580-1-mingyen.hsieh@mediatek.com Signed-off-by: Felix Fietkau (cherry picked from commit 9679ca7326e52282cc923c4d71d81c999cb6cd55) Signed-off-by: You-Sheng Yang Acked-by: Ivan Hu Acked-by: Mehmet Basaran Signed-off-by: Roxana Nicolescu --- drivers/net/wireless/mediatek/mt76/mt7925/mcu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c index e1dd89a7a79c..bb171ba8177b 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c @@ -613,6 +613,9 @@ static int mt7925_load_clc(struct mt792x_dev *dev, const char *fw_name) for (offset = 0; offset < len; offset += le32_to_cpu(clc->len)) { clc = (const struct mt7925_clc *)(clc_base + offset); + if (clc->idx > ARRAY_SIZE(phy->clc)) + break; + /* do not init buf again if chip reset triggered */ if (phy->clc[clc->idx]) continue;