Patchwork rtc: rtc-sh - fix a memory leak

login
register
mail settings
Submitter Axel Lin
Date Nov. 8, 2010, 5:35 a.m.
Message ID <1289194510.682.5.camel@mola>
Download mbox | patch
Permalink /patch/70397/
State New
Headers show

Comments

Axel Lin - Nov. 8, 2010, 5:35 a.m.
request_mem_region() will call kzalloc to allocate memory for struct resource.
release_resource() unregisters the resource but does not free the allocated
memory, thus use release_mem_region() instead to fix the memory leak.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 drivers/rtc/rtc-sh.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Paul Mundt - Nov. 8, 2010, 5:48 a.m.
On Mon, Nov 08, 2010 at 01:35:10PM +0800, Axel Lin wrote:
> request_mem_region() will call kzalloc to allocate memory for struct resource.
> release_resource() unregisters the resource but does not free the allocated
> memory, thus use release_mem_region() instead to fix the memory leak.
> 
> Signed-off-by: Axel Lin <axel.lin@gmail.com>

Good catch! Applied, thanks.

Patch

diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index 5efbd59..06e41ed 100644
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -761,7 +761,7 @@  err_unmap:
 	clk_put(rtc->clk);
 	iounmap(rtc->regbase);
 err_badmap:
-	release_resource(rtc->res);
+	release_mem_region(rtc->res->start, rtc->regsize);
 err_badres:
 	kfree(rtc);
 
@@ -786,7 +786,7 @@  static int __exit sh_rtc_remove(struct platform_device *pdev)
 	}
 
 	iounmap(rtc->regbase);
-	release_resource(rtc->res);
+	release_mem_region(rtc->res->start, rtc->regsize);
 
 	clk_disable(rtc->clk);
 	clk_put(rtc->clk);