[PATCH] phy: marvell: phy-mvebu-a3700-comphy: Add of_node_put() before return

[PATCH] phy: marvell: phy-mvebu-a3700-comphy: Add of_node_put() before return

[Nishka Dasgupta]

Each iteration of for_each_available_child_of_node puts the previous
node, but in the case of a return from the middle of the loop, there is
no put, thus causing a memory leak. Hence add an of_node_put before the
return in two places.
Issue found with Coccinelle.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
---
 drivers/phy/marvell/phy-mvebu-a3700-comphy.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/phy/marvell/phy-mvebu-a3700-comphy.c b/drivers/phy/marvell/phy-mvebu-a3700-comphy.c
index 8812a104c233..0ebac46435bd 100644
--- a/drivers/phy/marvell/phy-mvebu-a3700-comphy.c
+++ b/drivers/phy/marvell/phy-mvebu-a3700-comphy.c
@@ -277,13 +277,17 @@ static int mvebu_a3700_comphy_probe(struct platform_device *pdev)
 		}
 
 		lane = devm_kzalloc(&pdev->dev, sizeof(*lane), GFP_KERNEL);
-		if (!lane)
+		if (!lane) {
+			of_node_put(child);
 			return -ENOMEM;
+		}
 
 		phy = devm_phy_create(&pdev->dev, child,
 				      &mvebu_a3700_comphy_ops);
-		if (IS_ERR(phy))
+		if (IS_ERR(phy)) {
+			of_node_put(child);
 			return PTR_ERR(phy);
+		}
 
 		lane->dev = &pdev->dev;
 		lane->mode = PHY_MODE_INVALID;
-- 
2.19.1

Re: [PATCH] phy: marvell: phy-mvebu-a3700-comphy: Add of_node_put() before return

[Miquel Raynal]

Hi Nishka,

Nishka Dasgupta <nishkadg.linux@gmail.com> wrote on Tue, 23 Jul 2019
16:21:08 +0530:

> Each iteration of for_each_available_child_of_node puts the previous
> node, but in the case of a return from the middle of the loop, there is
> no put, thus causing a memory leak. Hence add an of_node_put before the
> return in two places.
> Issue found with Coccinelle.
> 
> Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
> ---
>  drivers/phy/marvell/phy-mvebu-a3700-comphy.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/phy/marvell/phy-mvebu-a3700-comphy.c b/drivers/phy/marvell/phy-mvebu-a3700-comphy.c
> index 8812a104c233..0ebac46435bd 100644
> --- a/drivers/phy/marvell/phy-mvebu-a3700-comphy.c
> +++ b/drivers/phy/marvell/phy-mvebu-a3700-comphy.c
> @@ -277,13 +277,17 @@ static int mvebu_a3700_comphy_probe(struct platform_device *pdev)
>  		}
>  
>  		lane = devm_kzalloc(&pdev->dev, sizeof(*lane), GFP_KERNEL);
> -		if (!lane)
> +		if (!lane) {
> +			of_node_put(child);
>  			return -ENOMEM;
> +		}
>  
>  		phy = devm_phy_create(&pdev->dev, child,
>  				      &mvebu_a3700_comphy_ops);
> -		if (IS_ERR(phy))
> +		if (IS_ERR(phy)) {
> +			of_node_put(child);
>  			return PTR_ERR(phy);
> +		}
>  
>  		lane->dev = &pdev->dev;
>  		lane->mode = PHY_MODE_INVALID;

Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>


Thanks,
Miquèl