Commit c6b486fb authored Apr 03, 2023 by Siddharth Vadapalli Committed by Paolo Abeni Apr 04, 2023

net: ethernet: ti: am65-cpsw: Fix mdio cleanup in probe

In the am65_cpsw_nuss_probe() function's cleanup path, the call to
of_platform_device_destroy() for the common->mdio_dev device is invoked
unconditionally. It is possible that either the MDIO node is not present
in the device-tree, or the MDIO node is disabled in the device-tree. In
both these cases, the MDIO device is not created, resulting in a NULL
pointer dereference when the of_platform_device_destroy() function is
invoked on the common->mdio_dev device on the cleanup path.

Fix this by ensuring that the common->mdio_dev device exists, before
attempting to invoke of_platform_device_destroy().

Fixes: a45cfcc6 ("net: ethernet: ti: am65-cpsw-nuss: use of_platform_device_create() for mdio")
Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com>
Reviewed-by: Roger Quadros <rogerq@kernel.org>
Link: https://lore.kernel.org/r/20230403090321.835877-1-s-vadapalli@ti.com

Signed-off-by: Paolo Abeni <pabeni@redhat.com>

parent ea30388b

drivers/net/ethernet/ti/am65-cpsw-nuss.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -2926,6 +2926,7 @@ static int am65_cpsw_nuss_probe(struct platform_device *pdev)
		am65_cpsw_nuss_phylink_cleanup(common);
		am65_cpts_release(common->cpts);
		err_of_clear:
		if (common->mdio_dev)
		of_platform_device_destroy(common->mdio_dev, NULL);
		err_pm_clear:
		pm_runtime_put_sync(dev);
		@@ -2956,6 +2957,7 @@ static int am65_cpsw_nuss_remove(struct platform_device *pdev)
		am65_cpts_release(common->cpts);
		am65_cpsw_disable_serdes_phy(common);

		if (common->mdio_dev)
		of_platform_device_destroy(common->mdio_dev, NULL);

		pm_runtime_put_sync(&pdev->dev);