Skip to contentSkip to conversation

phy: qualcomm: phy-qcom-qmp: Add of_node_put() before return

PATCH In review Nishka Dasgupta 3 participants 3 messages Aug 4, 2019 – Aug 5, 2019

Subsystems (3)
Arm Qualcomm mailing list Kernel janitors Generic PHY framework
lore
Share & tools
lore

Nishka Dasgupta

author
#0 lore raw

PATCH 1/1 phy: qualcomm: phy-qcom-qmp: Add of_node_put() before return

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 <[email protected]>
---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/phy/qualcomm/phy-qcom-qmp.c +2 -0
index 34ff6434da8f..2f0652efebf0 100644
@@ -2094,6 +2094,7 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
 			dev_err(dev, "failed to create lane%d phy, %d\n",
 				id, ret);
 			pm_runtime_disable(dev);
+			of_node_put(child);
 			return ret;
 		}
 

@@ -2106,6 +2107,7 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
 			dev_err(qmp->dev,
 				"failed to register pipe clock source\n");
 			pm_runtime_disable(dev);
+			of_node_put(child);
 			return ret;
 		}
 		id++;
Signature · 1 line
2.19.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 25 lines · 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 <[email protected]>
---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/phy/qualcomm/phy-qcom-qmp.c +1 -0
index 34ff6434da8f..2f0652efebf0 100644
@@ -2094,6 +2094,7 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
                        dev_err(dev, "failed to create lane%d phy, %d\n",
                                id, ret);
                        pm_runtime_disable(dev);
+                       of_node_put(child);
                        return ret;
                }

drivers/phy/qualcomm/phy-qcom-qmp.c static int qcom_qmp_phy_probe(struct platform_device *pdev) · line 2110

Quoted 4 lines
drivers/phy/qualcomm/phy-qcom-qmp.c +1 -0
@@ -2106,6 +2107,7 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
                        dev_err(qmp->dev,
                                "failed to register pipe clock source\n");
                        pm_runtime_disable(dev);
+                       of_node_put(child);

Nice find. Thanks for the patch.

Reviewed-by Vivek Gautam <[email protected]>

Best regards
Vivek

[snip]

Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
#2 lore raw
In reply to Nishka Dasgupta

drivers/phy/qualcomm/phy-qcom-qmp.c static int qcom_qmp_phy_probe(struct platform_device *pdev) · line 2099

Quoted 8 lines

+++ b/drivers/phy/qualcomm/phy-qcom-qmp.c

drivers/phy/qualcomm/phy-qcom-qmp.c +1 -0
@@ -2094,6 +2094,7 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
 			dev_err(dev, "failed to create lane%d phy, %d\n",
 				id, ret);
 			pm_runtime_disable(dev);
+			of_node_put(child);
 			return ret;
 		}

I suggest to move a bit of common exception handling code to the end of this function implementation.
Would you like to add a jump target?

Regards,
Markus