diff options
| author | Petr Štetiar <ynezz@true.cz> | 2019-05-06 23:24:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-07 12:22:47 -0700 |
| commit | da48be3373438224da1a5832cb7ffce1f1752a75 (patch) | |
| tree | 7967fac3890f76195303c85af63e9dfd0e4d56f1 | |
| parent | 4974f9b7e0c90a751e9ec306701c49487e81625a (diff) | |
staging: octeon-ethernet: Fix of_get_mac_address ERR_PTR check
Commit 284eb160681c ("staging: octeon-ethernet: support
of_get_mac_address new ERR_PTR error") has introduced checking for
ERR_PTR encoded error value from of_get_mac_address with IS_ERR macro,
which is not sufficient in this case, as the mac variable is set to NULL
initialy and if the kernel is compiled without DT support this NULL
would get passed to IS_ERR, which would lead to the wrong decision and
would pass that NULL pointer and invalid MAC address further.
Fixes: 284eb160681c ("staging: octeon-ethernet: support of_get_mac_address new ERR_PTR error")
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/staging/octeon/ethernet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index 2b0301821d7b..8847a11c212f 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -421,7 +421,7 @@ int cvm_oct_common_init(struct net_device *dev) if (priv->of_node) mac = of_get_mac_address(priv->of_node); - if (!IS_ERR(mac)) + if (!IS_ERR_OR_NULL(mac)) ether_addr_copy(dev->dev_addr, mac); else eth_hw_addr_random(dev); |