[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-id: <1421286107-9514-1-git-send-email-kgene@kernel.org>
Date: Thu, 15 Jan 2015 10:41:47 +0900
From: Kukjin Kim <kgene@...nel.org>
To: netdev@...r.kernel.org
Cc: Dave Miller <davem@...emloft.ne>,
"Girish K.S" <ks.giri@...sung.com>,
Byungho An <bh74.an@...sung.com>, Kukjin Kim <kgene@...nel.org>
Subject: [PATCH] net: sxgbe: Fix NULL dereferece when using DT
From: Girish K.S <ks.giri@...sung.com>
When the MAC address is provided in the device tree file, the
condition is true and kernel crashes due to NULL dereference.
Signed-off-by: Girish K.S <ks.giri@...sung.com>
Signed-off-by: Byungho An <bh74.an@...sung.com>
Signed-off-by: Kukjin Kim <kgene@...nel.org>
---
drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c
index 866560e..b02eed1 100644
--- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c
+++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c
@@ -108,10 +108,6 @@ static int sxgbe_platform_probe(struct platform_device *pdev)
}
}
- /* Get MAC address if available (DT) */
- if (mac)
- ether_addr_copy(priv->dev->dev_addr, mac);
-
priv = sxgbe_drv_probe(&(pdev->dev), plat_dat, addr);
if (!priv) {
pr_err("%s: main driver probe failed\n", __func__);
@@ -125,6 +121,10 @@ static int sxgbe_platform_probe(struct platform_device *pdev)
goto err_drv_remove;
}
+ /* Get MAC address if available (DT) */
+ if (mac)
+ ether_addr_copy(priv->dev->dev_addr, mac);
+
/* Get the TX/RX IRQ numbers */
for (i = 0, chan = 1; i < SXGBE_TX_QUEUES; i++) {
priv->txq[i]->irq_no = irq_of_parse_and_map(node, chan++);
--
2.0.0
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists