net: sxgbe: Fix NULL dereferece when using DT (1c1832c7) · Commits · 戴 / test

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:

drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -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++);