2010-08-04 01:53:07

by Axel Lin

Subject: [PATCH] wm8350-core: fix wrong kfree in error path

This patch includes below fixes:
1. fix wm8350_create_cache error path
make sure wm8350->reg_cache is freed in error path.
2. fix wm8350_device_init error path
no need to kfree(wm8350->reg_cache) in the case of goto out.

Signed-off-by: Axel Lin <[email protected]>
---
drivers/mfd/wm8350-core.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c
index b580748..e81cc31 100644
--- a/drivers/mfd/wm8350-core.c
+++ b/drivers/mfd/wm8350-core.c
@@ -536,6 +536,7 @@ static int wm8350_create_cache(struct wm8350 *wm8350, int type, int mode)
}

out:
+ kfree(wm8350->reg_cache);
return ret;
}

@@ -700,7 +701,7 @@ int wm8350_device_init(struct wm8350 *wm8350, int irq,

ret = wm8350_irq_init(wm8350, irq, pdata);
if (ret < 0)
- goto err;
+ goto err_free;

if (wm8350->irq_base) {
ret = request_threaded_irq(wm8350->irq_base +
@@ -738,8 +739,9 @@ int wm8350_device_init(struct wm8350 *wm8350, int irq,

err_irq:
wm8350_irq_exit(wm8350);
-err:
+err_free:
kfree(wm8350->reg_cache);
+err:
return ret;
}
EXPORT_SYMBOL_GPL(wm8350_device_init);
--
1.5.4.3

2010-08-04 07:57:27

by Mark Brown

Subject: Re: [PATCH] wm8350-core: fix wrong kfree in error path

On Wed, Aug 04, 2010 at 09:54:21AM +0800, Axel Lin wrote:
> This patch includes below fixes:
> 1. fix wm8350_create_cache error path
> make sure wm8350->reg_cache is freed in error path.
> 2. fix wm8350_device_init error path
> no need to kfree(wm8350->reg_cache) in the case of goto out.
>
> Signed-off-by: Axel Lin <[email protected]>

Acked-by: Mark Brown <[email protected]>

Please remember to always submit separate patches for separate issues,
mixing things together makes review harder and means that if there's a
problem with one part of what you've done the entire patch gets held up.

2010-08-05 16:21:17

by Samuel Ortiz

Subject: Re: [PATCH] wm8350-core: fix wrong kfree in error path

Hi Axel,

On Wed, Aug 04, 2010 at 09:54:21AM +0800, Axel Lin wrote:
> This patch includes below fixes:
> 1. fix wm8350_create_cache error path
> make sure wm8350->reg_cache is freed in error path.
> 2. fix wm8350_device_init error path
> no need to kfree(wm8350->reg_cache) in the case of goto out.
Applied, although as Mark pointed out, I'd have preferred 2 patches here.

Cheers,
Samuel.

--
Intel Open Source Technology Centre
http://oss.intel.com/