2019-04-01 08:04:08

by Peng Hao

Subject: [PATCH v3] arm/mach-at91/pm : fix possible object reference leak

of_find_device_by_node() takes a reference to the struct device
when it finds a match via get_device. When returning error we should
call put_device.

Signed-off-by: Peng Hao <[email protected]>
---
arch/arm/mach-at91/pm.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 51e808a..38511a5 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -591,13 +591,13 @@ static int __init at91_pm_backup_init(void)

np = of_find_compatible_node(NULL, NULL, "atmel,sama5d2-securam");
if (!np)
- goto securam_fail;
+ goto securam_fail_no_get;

pdev = of_find_device_by_node(np);
of_node_put(np);
if (!pdev) {
pr_warn("%s: failed to find securam device!\n", __func__);
- goto securam_fail;
+ goto securam_fail_no_get;
}

sram_pool = gen_pool_get(&pdev->dev, NULL);
@@ -620,6 +620,8 @@ static int __init at91_pm_backup_init(void)
return 0;

securam_fail:
+ put_device(&pdev->dev);
+securam_fail_no_get:
iounmap(pm_data.sfrbu);
pm_data.sfrbu = NULL;
return ret;
--
1.8.3.1

2019-04-01 08:52:38

by Mukesh Ojha

Subject: Re: [PATCH v3] arm/mach-at91/pm : fix possible object reference leak

On 4/1/2019 9:56 PM, Peng Hao wrote:
> of_find_device_by_node() takes a reference to the struct device
> when it finds a match via get_device. When returning error we should
> call put_device.
>
> Signed-off-by: Peng Hao <[email protected]>
> ---
> arch/arm/mach-at91/pm.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
> index 51e808a..38511a5 100644
> --- a/arch/arm/mach-at91/pm.c
> +++ b/arch/arm/mach-at91/pm.c
> @@ -591,13 +591,13 @@ static int __init at91_pm_backup_init(void)
>
> np = of_find_compatible_node(NULL, NULL, "atmel,sama5d2-securam");
> if (!np)
> - goto securam_fail;
> + goto securam_fail_no_get;


s/securam_fail_no_get/securam_fail_no_ref_dev

otherwise looks good.
Reviewed-by: Mukesh Ojha <[email protected]>

Cheers,
-Mukesh


>
> pdev = of_find_device_by_node(np);
> of_node_put(np);
> if (!pdev) {
> pr_warn("%s: failed to find securam device!\n", __func__);
> - goto securam_fail;
> + goto securam_fail_no_get;
> }
>
> sram_pool = gen_pool_get(&pdev->dev, NULL);
> @@ -620,6 +620,8 @@ static int __init at91_pm_backup_init(void)
> return 0;
>
> securam_fail:
> + put_device(&pdev->dev);
> +securam_fail_no_get:
> iounmap(pm_data.sfrbu);
> pm_data.sfrbu = NULL;
> return ret;