2020-06-19 10:47:11

by Chen Tao

Subject: [PATCH] ARM: OMAP2+: Fix possible memory leak in omap_hwmod_allocate_module

Fix memory leak in omap_hwmod_allocate_module not freeing in
handling error path.

Fixes: 8c87970543b17("ARM: OMAP2+: Add functions to allocate module data from device tree")
Signed-off-by: Chen Tao <[email protected]>
---
arch/arm/mach-omap2/omap_hwmod.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 82706af307de..d2667f28e68e 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -3435,7 +3435,7 @@ static int omap_hwmod_allocate_module(struct device *dev, struct omap_hwmod *oh,
regs = ioremap(data->module_pa,
data->module_size);
if (!regs)
- return -ENOMEM;
+ goto out_free_sysc;
}

/*
@@ -3445,13 +3445,13 @@ static int omap_hwmod_allocate_module(struct device *dev, struct omap_hwmod *oh,
if (oh->class->name && strcmp(oh->class->name, data->name)) {
class = kmemdup(oh->class, sizeof(*oh->class), GFP_KERNEL);
if (!class)
- return -ENOMEM;
+ goto out_unmap;
}

if (list_empty(&oh->slave_ports)) {
oi = kcalloc(1, sizeof(*oi), GFP_KERNEL);
if (!oi)
- return -ENOMEM;
+ goto out_free_class;

/*
* Note that we assume interconnect interface clocks will be
@@ -3478,6 +3478,14 @@ static int omap_hwmod_allocate_module(struct device *dev, struct omap_hwmod *oh,
spin_unlock_irqrestore(&oh->_lock, flags);

return 0;
+
+out_free_class:
+ kfree(class);
+out_unmap:
+ iounmap();
+out_free_sysc:
+ kfree(sysc);
+ return -ENOMEM;
}

static const struct omap_hwmod_reset omap24xx_reset_quirks[] = {
--
2.22.0

2020-06-19 15:48:52

by Paul Walmsley

Subject: Re: [PATCH] ARM: OMAP2+: Fix possible memory leak in omap_hwmod_allocate_module

On Fri, 19 Jun 2020, Chen Tao wrote:

> Fix memory leak in omap_hwmod_allocate_module not freeing in
> handling error path.
>
> Fixes: 8c87970543b17("ARM: OMAP2+: Add functions to allocate module data from device tree")
> Signed-off-by: Chen Tao <[email protected]>

Reviewed-by: Paul Walmsley <[email protected]>

- Paul

2020-07-13 16:48:27

by Tony Lindgren

Subject: Re: [PATCH] ARM: OMAP2+: Fix possible memory leak in omap_hwmod_allocate_module

* Paul Walmsley <[email protected]> [200619 15:20]:
> On Fri, 19 Jun 2020, Chen Tao wrote:
>
> > Fix memory leak in omap_hwmod_allocate_module not freeing in
> > handling error path.
> >
> > Fixes: 8c87970543b17("ARM: OMAP2+: Add functions to allocate module data from device tree")
> > Signed-off-by: Chen Tao <[email protected]>
>
> Reviewed-by: Paul Walmsley <[email protected]>

Thanks applying into fixes.

Tony