Commit 057b05d5 authored by Nishka Dasgupta's avatar Nishka Dasgupta Committed by Vinod Koul

dmaengine: qcom: hidma_mgmt: Add of_node_put() before goto

Each iteration of for_each_available_child_of_node puts the previous
node, but in the case of a goto from the middle of the loop, there is
no put, thus causing a memory leak.
Hence add an of_node_put under the label that the gotos point to.
In order to avoid decrementing an already-decremented refcount, copy the
original contents of the label (including the return statement) to just
above the label, so that the code under the label is executed only when
a goto exit from the loop occurs.
Additionally, remove an unnecessary get/put pair from the loop, as the
loop itself already keeps track of refcount.
Issue found with Coccinelle.
Signed-off-by: default avatarNishka Dasgupta <nishkadg.linux@gmail.com>
Acked-by: default avatarSinan Kaya <okaya@kernel.org>
Link: https://lore.kernel.org/r/20190724081609.9724-1-nishkadg.linux@gmail.comSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 232a7f18
...@@ -387,7 +387,6 @@ static int __init hidma_mgmt_of_populate_channels(struct device_node *np) ...@@ -387,7 +387,6 @@ static int __init hidma_mgmt_of_populate_channels(struct device_node *np)
ret = PTR_ERR(new_pdev); ret = PTR_ERR(new_pdev);
goto out; goto out;
} }
of_node_get(child);
new_pdev->dev.of_node = child; new_pdev->dev.of_node = child;
of_dma_configure(&new_pdev->dev, child, true); of_dma_configure(&new_pdev->dev, child, true);
/* /*
...@@ -395,9 +394,14 @@ static int __init hidma_mgmt_of_populate_channels(struct device_node *np) ...@@ -395,9 +394,14 @@ static int __init hidma_mgmt_of_populate_channels(struct device_node *np)
* platforms with or without MSI support. * platforms with or without MSI support.
*/ */
of_msi_configure(&new_pdev->dev, child); of_msi_configure(&new_pdev->dev, child);
of_node_put(child);
} }
kfree(res);
return ret;
out: out:
of_node_put(child);
kfree(res); kfree(res);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment