]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
wifi: mt76: do not send firmware FW_FEATURE_NON_DL region
authorDeren Wu <deren.wu@mediatek.com>
Thu, 24 Nov 2022 14:20:38 +0000 (22:20 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 31 Dec 2022 12:32:21 +0000 (13:32 +0100)
[ Upstream commit f37f76d43865c58cb96aa13c87164abb41f22d0b ]

skip invalid section to avoid potential risks

Fixes: 23bdc5d8cadf ("wifi: mt76: mt7921: introduce Country Location Control support")
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_connac_mcu.c

index 011fc9729b38c21eff1d3ae63ea56e8662e91263..025a237c1cce8f26af77d29c81355248fc82285c 100644 (file)
@@ -2834,6 +2834,9 @@ mt76_connac_mcu_send_ram_firmware(struct mt76_dev *dev,
                len = le32_to_cpu(region->len);
                addr = le32_to_cpu(region->addr);
 
+               if (region->feature_set & FW_FEATURE_NON_DL)
+                       goto next;
+
                if (region->feature_set & FW_FEATURE_OVERRIDE_ADDR)
                        override = addr;
 
@@ -2850,6 +2853,7 @@ mt76_connac_mcu_send_ram_firmware(struct mt76_dev *dev,
                        return err;
                }
 
+next:
                offset += len;
        }