From 19c8e20c55149a237ec3b48ba3b5bd5639033102 Mon Sep 17 00:00:00 2001 From: Shayne Chen Date: Tue, 26 Nov 2019 21:15:54 +0800 Subject: [PATCH] mt76: fix possible undetected invalid MAC address 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 Signed-off-by: Felix Fietkau --- eeprom.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eeprom.c b/eeprom.c index 0393980c..4847ed52 100644 --- a/eeprom.c +++ b/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_OR_NULL(mac)) memcpy(dev->macaddr, mac, ETH_ALEN); #endif +out: if (!is_valid_ether_addr(dev->macaddr)) { eth_random_addr(dev->macaddr); dev_info(dev->dev,