lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <1556870168-26864-7-git-send-email-ynezz@true.cz> Date: Fri, 3 May 2019 09:56:03 +0200 From: Petr Štetiar <ynezz@...e.cz> To: netdev@...r.kernel.org, devicetree@...r.kernel.org, Steve Glendinning <steve.glendinning@...well.net>, Microchip Linux Driver Support <UNGLinuxDriver@...rochip.com> Cc: Andrew Lunn <andrew@...n.ch>, Florian Fainelli <f.fainelli@...il.com>, Heiner Kallweit <hkallweit1@...il.com>, Frank Rowand <frowand.list@...il.com>, Srinivas Kandagatla <srinivas.kandagatla@...aro.org>, Maxime Ripard <maxime.ripard@...tlin.com>, Petr Štetiar <ynezz@...e.cz>, linux-usb@...r.kernel.org, linux-kernel@...r.kernel.org Subject: [PATCH v3 06/10] net: usb: support of_get_mac_address new ERR_PTR error There was NVMEM support added to of_get_mac_address, so it could now return NULL and ERR_PTR encoded error values, so we need to adjust all current users of of_get_mac_address to this new fact. Signed-off-by: Petr Štetiar <ynezz@...e.cz> --- drivers/net/usb/smsc75xx.c | 2 +- drivers/net/usb/smsc95xx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c index ec287c9..7acfa64 100644 --- a/drivers/net/usb/smsc75xx.c +++ b/drivers/net/usb/smsc75xx.c @@ -774,7 +774,7 @@ static void smsc75xx_init_mac_address(struct usbnet *dev) /* maybe the boot loader passed the MAC address in devicetree */ mac_addr = of_get_mac_address(dev->udev->dev.of_node); - if (mac_addr) { + if (!IS_ERR_OR_NULL(mac_addr)) { memcpy(dev->net->dev_addr, mac_addr, ETH_ALEN); return; } diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index e3d08626..841699f 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -917,7 +917,7 @@ static void smsc95xx_init_mac_address(struct usbnet *dev) /* maybe the boot loader passed the MAC address in devicetree */ mac_addr = of_get_mac_address(dev->udev->dev.of_node); - if (mac_addr) { + if (!IS_ERR_OR_NULL(mac_addr)) { memcpy(dev->net->dev_addr, mac_addr, ETH_ALEN); return; } -- 1.9.1
Powered by blists - more mailing lists