2022-06-02 06:19:08

by Miaoqian Lin

Subject: [PATCH] soc: qcom: ocmem: Fix refcount leak in of_get_ocmem

of_parse_phandle() returns a node pointer with refcount
incremented, we should use of_node_put() on it when not need anymore.
Add missing of_node_put() to avoid refcount leak.
of_node_put() will check NULL pointer.

Fixes: 88c1e9404f1d ("soc: qcom: add OCMEM driver")
Signed-off-by: Miaoqian Lin <[email protected]>
---
drivers/soc/qcom/ocmem.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/soc/qcom/ocmem.c b/drivers/soc/qcom/ocmem.c
index 97fd24c178f8..c92d26b73e6f 100644
--- a/drivers/soc/qcom/ocmem.c
+++ b/drivers/soc/qcom/ocmem.c
@@ -194,14 +194,17 @@ struct ocmem *of_get_ocmem(struct device *dev)
devnode = of_parse_phandle(dev->of_node, "sram", 0);
if (!devnode || !devnode->parent) {
dev_err(dev, "Cannot look up sram phandle\n");
+ of_node_put(devnode);
return ERR_PTR(-ENODEV);
}

pdev = of_find_device_by_node(devnode->parent);
if (!pdev) {
dev_err(dev, "Cannot find device node %s\n", devnode->name);
+ of_node_put(devnode);
return ERR_PTR(-EPROBE_DEFER);
}
+ of_node_put(devnode);

ocmem = platform_get_drvdata(pdev);
if (!ocmem) {
--
2.25.1

2022-06-02 15:08:19

by Brian Masney

Subject: Re: [PATCH] soc: qcom: ocmem: Fix refcount leak in of_get_ocmem

On Thu, Jun 02, 2022 at 08:24:30AM +0400, Miaoqian Lin wrote:
> of_parse_phandle() returns a node pointer with refcount
> incremented, we should use of_node_put() on it when not need anymore.
> Add missing of_node_put() to avoid refcount leak.
> of_node_put() will check NULL pointer.
>
> Fixes: 88c1e9404f1d ("soc: qcom: add OCMEM driver")
> Signed-off-by: Miaoqian Lin <[email protected]>

Reviewed-by: Brian Masney <[email protected]>

2022-07-03 04:46:35

by Bjorn Andersson

Subject: Re: (subset) [PATCH] soc: qcom: ocmem: Fix refcount leak in of_get_ocmem

On Thu, 2 Jun 2022 08:24:30 +0400, Miaoqian Lin wrote:
> of_parse_phandle() returns a node pointer with refcount
> incremented, we should use of_node_put() on it when not need anymore.
> Add missing of_node_put() to avoid refcount leak.
> of_node_put() will check NULL pointer.
>
>

Applied, thanks!

[1/1] soc: qcom: ocmem: Fix refcount leak in of_get_ocmem
commit: 92a563fcf14b3093226fb36f12e9b5cf630c5a5d

Best regards,
--
Bjorn Andersson <[email protected]>