| Message ID | 20190804162420.6005-1-nishkadg.linux@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | phy: qualcomm: phy-qcom-qmp: Add of_node_put() before return | expand |
On Sun, Aug 4, 2019 at 9:54 PM Nishka Dasgupta <nishkadg.linux@gmail.com> wrote: > > 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/qualcomm/phy-qcom-qmp.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c > index 34ff6434da8f..2f0652efebf0 100644 > --- a/drivers/phy/qualcomm/phy-qcom-qmp.c > +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c > @@ -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); Nice find. Thanks for the patch. Reviewed-by: Vivek Gautam <vivek.gautam@codeaurora.org> Best regards Vivek [snip]
> +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c > @@ -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
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c index 34ff6434da8f..2f0652efebf0 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c @@ -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++;
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/qualcomm/phy-qcom-qmp.c | 2 ++ 1 file changed, 2 insertions(+)