2019-04-01 02:58:19

by Peng Hao

Subject: [PATCH V2] 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 | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 51e808a..b60fcc9 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -591,7 +591,7 @@ 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_1;

pdev = of_find_device_by_node(np);
of_node_put(np);
@@ -620,6 +620,8 @@ static int __init at91_pm_backup_init(void)
return 0;

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

2019-04-01 07:07:07

by Mukesh Ojha

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

On 4/1/2019 4:50 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 | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
> index 51e808a..b60fcc9 100644
> --- a/arch/arm/mach-at91/pm.c
> +++ b/arch/arm/mach-at91/pm.c
> @@ -591,7 +591,7 @@ 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_1;
>
> pdev = of_find_device_by_node(np);
> of_node_put(np);


I think you missed the label in

if (!pdev)

    goto securam_fail_1


Please fix that and also if possible give some proper name to the label.

Cheers,
Mukesh

> @@ -620,6 +620,8 @@ static int __init at91_pm_backup_init(void)
> return 0;
>
> securam_fail:
> + put_device(&pdev->dev);
> +securam_fail_1:



> iounmap(pm_data.sfrbu);
> pm_data.sfrbu = NULL;
> return ret;