Patch "net: ethernet: ti: am65-cpsw: Fix mdio cleanup in probe" has been added to the 5.10-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

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

to the 5.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     net-ethernet-ti-am65-cpsw-fix-mdio-cleanup-in-probe.patch
and it can be found in the queue-5.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 1c07a66e39e25f9eca8ca5800db8e7438cd4ad60
Author: Siddharth Vadapalli <s-vadapalli@xxxxxx>
Date:   Mon Apr 3 14:33:21 2023 +0530

    net: ethernet: ti: am65-cpsw: Fix mdio cleanup in probe
    
    [ Upstream commit c6b486fb33680ad5a3a6390ce693c835caaae3f7 ]
    
    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: a45cfcc69a25 ("net: ethernet: ti: am65-cpsw-nuss: use of_platform_device_create() for mdio")
    Signed-off-by: Siddharth Vadapalli <s-vadapalli@xxxxxx>
    Reviewed-by: Roger Quadros <rogerq@xxxxxxxxxx>
    Link: https://lore.kernel.org/r/20230403090321.835877-1-s-vadapalli@xxxxxx
    Signed-off-by: Paolo Abeni <pabeni@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
index 4074310abcff4..e4af1f506b833 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@ -2153,7 +2153,8 @@ static int am65_cpsw_nuss_probe(struct platform_device *pdev)
 	return 0;
 
 err_of_clear:
-	of_platform_device_destroy(common->mdio_dev, NULL);
+	if (common->mdio_dev)
+		of_platform_device_destroy(common->mdio_dev, NULL);
 err_pm_clear:
 	pm_runtime_put_sync(dev);
 	pm_runtime_disable(dev);
@@ -2179,7 +2180,8 @@ static int am65_cpsw_nuss_remove(struct platform_device *pdev)
 	 */
 	am65_cpsw_nuss_cleanup_ndev(common);
 
-	of_platform_device_destroy(common->mdio_dev, NULL);
+	if (common->mdio_dev)
+		of_platform_device_destroy(common->mdio_dev, NULL);
 
 	pm_runtime_put_sync(&pdev->dev);
 	pm_runtime_disable(&pdev->dev);



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux