* [PATCH] ARM: dma-mapping: Fix potential memory leak in atomic_pool_init()
@ 2012-09-17 5:09 Sachin Kamat
2012-09-24 7:05 ` Marek Szyprowski
0 siblings, 1 reply; 2+ messages in thread
From: Sachin Kamat @ 2012-09-17 5:09 UTC (permalink / raw)
To: linux-arm-kernel
When either of __alloc_from_contiguous or __alloc_remap_buffer fails
to provide a valid pointer, allocated memory is freed up and an error
is returned. 'pages' was however not freed before returning error.
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
arch/arm/mm/dma-mapping.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 546a3e8..477a2d2 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -367,6 +367,8 @@ static int __init atomic_pool_init(void)
(unsigned)pool->size / 1024);
return 0;
}
+
+ kfree(pages);
no_pages:
kfree(bitmap);
no_bitmap:
--
1.7.4.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] ARM: dma-mapping: Fix potential memory leak in atomic_pool_init()
2012-09-17 5:09 [PATCH] ARM: dma-mapping: Fix potential memory leak in atomic_pool_init() Sachin Kamat
@ 2012-09-24 7:05 ` Marek Szyprowski
0 siblings, 0 replies; 2+ messages in thread
From: Marek Szyprowski @ 2012-09-24 7:05 UTC (permalink / raw)
To: linux-arm-kernel
Hello,
On Monday, September 17, 2012 7:10 AM Sachin Kamat wrote:
> When either of __alloc_from_contiguous or __alloc_remap_buffer fails
> to provide a valid pointer, allocated memory is freed up and an error
> is returned. 'pages' was however not freed before returning error.
>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Marek Szyprowski <m.szyprowski@samsung.com>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> ---
> arch/arm/mm/dma-mapping.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
> index 546a3e8..477a2d2 100644
> --- a/arch/arm/mm/dma-mapping.c
> +++ b/arch/arm/mm/dma-mapping.c
> @@ -367,6 +367,8 @@ static int __init atomic_pool_init(void)
> (unsigned)pool->size / 1024);
> return 0;
> }
> +
> + kfree(pages);
> no_pages:
> kfree(bitmap);
> no_bitmap:
> --
> 1.7.4.1
Applied to my fixes-for-3.6 branch. Thanks for spotting this issue!
Best regards
--
Marek Szyprowski
Samsung Poland R&D Center
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-09-24 7:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-17 5:09 [PATCH] ARM: dma-mapping: Fix potential memory leak in atomic_pool_init() Sachin Kamat
2012-09-24 7:05 ` Marek Szyprowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).