| Message ID | 1554214358-113444-1-git-send-email-peng.hao2@zte.com.cn (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | ba5e60c9b75dec92d4c695b928f69300b17d7686 |
| Headers | show |
| Series | [v4] arm/mach-at91/pm : fix possible object reference leak | expand |
On Tue, Apr 02, 2019 at 10:12:38PM +0800, 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. > > Reviewed-by: Mukesh Ojha <mojha@codeaurora.org> > Signed-off-by: Peng Hao <peng.hao2@zte.com.cn> Thanks applied to at91-fixes with: Fixes: 24a0f5c539f9 ("ARM: at91: pm: Add sama5d2 backup mode") Cc: <stable@vger.kernel.org> # v4.14+ > --- > 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_ref_dev; > > 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_ref_dev; > } > > 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_ref_dev: > iounmap(pm_data.sfrbu); > pm_data.sfrbu = NULL; > return ret; > -- > 1.8.3.1 > >
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_ref_dev; 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_ref_dev; } 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_ref_dev: iounmap(pm_data.sfrbu); pm_data.sfrbu = NULL; return ret;