From eba571683b40eb1ad982c6ce9b92d15724bc220e Mon Sep 17 00:00:00 2001
From: Shayne Chen <shayne.chen@mediatek.com>
Date: Tue, 26 Nov 2019 21:15:54 +0800
Subject: [PATCH] mt76: fix possible undetected invalid MAC address
Git-commit: eba571683b40eb1ad982c6ce9b92d15724bc220e
Patch-mainline: v5.7-rc1
References: jsc#SLE-13430
Make sure the MAC address is checked before function returns.
If CONFIG_OF is set and the device node is null, the function will
return directly, and an invalid MAC address will not be checked.
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Acked-by: Takashi Iwai <tiwai@suse.de>
---
drivers/net/wireless/mediatek/mt76/eeprom.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/mediatek/mt76/eeprom.c b/drivers/net/wireless/mediatek/mt76/eeprom.c
index 804224e81103..358fb0a1e523 100644
--- a/drivers/net/wireless/mediatek/mt76/eeprom.c
+++ b/drivers/net/wireless/mediatek/mt76/eeprom.c
@@ -80,13 +80,14 @@ mt76_eeprom_override(struct mt76_dev *dev)
const u8 *mac;
if (!np)
- return;
+ goto out;
mac = of_get_mac_address(np);
if (!IS_ERR(mac))
ether_addr_copy(dev->macaddr, mac);
#endif
+out:
if (!is_valid_ether_addr(dev->macaddr)) {
eth_random_addr(dev->macaddr);
dev_info(dev->dev,
--
2.16.4