Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfa49cfc authored by Colin Ian King's avatar Colin Ian King Committed by David S. Miller
Browse files

net/ethoc: fix null dereference on error exit path 



priv is assigned to NULL however some of the early error exit paths to
label 'free' dereference priv, causing a null pointer dereference.

Move the label 'free' to just the free_netdev statement, and add a new
exit path 'free2' for the error cases were clk_disable_unprepare needs
calling before the final free.

Fixes issue found by CoverityScan, CID#113260

Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Reviewed-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fc14963f

drivers/net/ethernet/ethoc.c

+4 −3
Original line number Diff line number Diff line
@@ -1195,7 +1195,7 @@ static int ethoc_probe(struct platform_device *pdev) 
	priv->mdio = mdiobus_alloc();

	if (!priv->mdio) {

		ret = -ENOMEM;

		goto free;

		goto free2;

	}



	priv->mdio->name = "ethoc-mdio";
@@ -1208,7 +1208,7 @@ static int ethoc_probe(struct platform_device *pdev) 
	ret = mdiobus_register(priv->mdio);

	if (ret) {

		dev_err(&netdev->dev, "failed to register MDIO bus\n");

		goto free;

		goto free2;

	}



	ret = ethoc_mdio_probe(netdev);
@@ -1241,9 +1241,10 @@ static int ethoc_probe(struct platform_device *pdev) 
error:

	mdiobus_unregister(priv->mdio);

	mdiobus_free(priv->mdio);

free:

free2:

	if (priv->clk)

		clk_disable_unprepare(priv->clk);

free:

	free_netdev(netdev);

out:

	return ret;