2019-03-26 23:54:46

by Huang Zijiang

Subject: [PATCH] ARM: socfpga: Fix object reference leaks in socfpga_setup_ocram_self_refresh

The of_find_device_by_node() takes a reference to the underlying device
structure, we should release that reference.

Signed-off-by: Huang Zijiang <[email protected]>
---
arch/arm/mach-socfpga/pm.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-socfpga/pm.c b/arch/arm/mach-socfpga/pm.c
index d486678..8d7ca14 100644
--- a/arch/arm/mach-socfpga/pm.c
+++ b/arch/arm/mach-socfpga/pm.c
@@ -53,7 +53,7 @@ static int socfpga_setup_ocram_self_refresh(void)
if (!pdev) {
pr_warn("%s: failed to find ocram device!\n", __func__);
ret = -ENODEV;
- goto put_node;
+ goto fail;
}

ocram_pool = gen_pool_get(&pdev->dev, NULL);
@@ -94,6 +94,9 @@ static int socfpga_setup_ocram_self_refresh(void)

put_node:
of_node_put(np);
+ put_device(&np->dev);
+fail:
+ of_node_put(np);

return ret;
}
--
1.8.3.1

2019-03-27 07:20:49

by Mukesh Ojha

Subject: Re: [PATCH] ARM: socfpga: Fix object reference leaks in socfpga_setup_ocram_self_refresh

On 3/27/2019 5:23 AM, Huang Zijiang wrote:
> The of_find_device_by_node() takes a reference to the underlying device
> structure, we should release that reference.
>
> Signed-off-by: Huang Zijiang <[email protected]>
> ---
> arch/arm/mach-socfpga/pm.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-socfpga/pm.c b/arch/arm/mach-socfpga/pm.c
> index d486678..8d7ca14 100644
> --- a/arch/arm/mach-socfpga/pm.c
> +++ b/arch/arm/mach-socfpga/pm.c
> @@ -53,7 +53,7 @@ static int socfpga_setup_ocram_self_refresh(void)
> if (!pdev) {
> pr_warn("%s: failed to find ocram device!\n", __func__);
> ret = -ENODEV;
> - goto put_node;
> + goto fail;
> }
>
> ocram_pool = gen_pool_get(&pdev->dev, NULL);
> @@ -94,6 +94,9 @@ static int socfpga_setup_ocram_self_refresh(void)
>
> put_node:
> of_node_put(np);
> + put_device(&np->dev);
> +fail:
> + of_node_put(np);


of_node_put is called twice for put_node label.

Thanks,
Mukesh


>
> return ret;
> }