Commit 2d683eaa authored Aug 21, 2019 by Antoine Tenart Committed by David S. Miller Aug 21, 2019

net: cpsw: fix NULL pointer exception in the probe error path

In certain cases when the probe function fails the error path calls
cpsw_remove_dt() before calling platform_set_drvdata(). This is an
issue as cpsw_remove_dt() uses platform_get_drvdata() to retrieve the
cpsw_common data and leds to a NULL pointer exception. This patches
fixes it by calling platform_set_drvdata() earlier in the probe.

Fixes: 83a8471b ("net: ethernet: ti: cpsw: refactor probe to group common hw initialization")
Reported-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 6e2866a9

drivers/net/ethernet/ti/cpsw.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2775,6 +2775,7 @@ static int cpsw_probe(struct platform_device *pdev)
		if (!cpsw)
		return -ENOMEM;

		platform_set_drvdata(pdev, cpsw);
		cpsw->dev = dev;

		mode = devm_gpiod_get_array_optional(dev, "mode", GPIOD_OUT_LOW);
		@@ -2879,7 +2880,6 @@ static int cpsw_probe(struct platform_device *pdev)
		goto clean_cpts;
		}

		platform_set_drvdata(pdev, cpsw);
		priv = netdev_priv(ndev);
		priv->cpsw = cpsw;
		priv->ndev = ndev;