[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-id: <049301cd9a22$f0b8c960$d22a5c20$%szyprowski@samsung.com>
Date: Mon, 24 Sep 2012 09:05:08 +0200
From: Marek Szyprowski <m.szyprowski@...sung.com>
To: 'Sachin Kamat' <sachin.kamat@...aro.org>,
linux-arm-kernel@...ts.infradead.org
Cc: linux-kernel@...r.kernel.org, patches@...aro.org,
'Arnd Bergmann' <arnd@...db.de>
Subject: RE: [PATCH] ARM: dma-mapping: Fix potential memory leak in
atomic_pool_init()
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@...db.de>
> Cc: Marek Szyprowski <m.szyprowski@...sung.com>
> Signed-off-by: Sachin Kamat <sachin.kamat@...aro.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists