From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Mon, 24 Sep 2012 06:35:03 +0000 (+0200)
Subject: ARM: dma-mapping: Fix potential memory leak in atomic_pool_init()
X-Git-Tag: v3.6~15^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ec10665cbf271fb1f60daeb194ad4f2cdcdc59d9;p=~emulex%2Finfiniband.git

ARM: dma-mapping: Fix potential memory leak in atomic_pool_init()

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>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index e59c4ab71bc..13f555d6249 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -346,6 +346,8 @@ static int __init atomic_pool_init(void)
 		       (unsigned)pool->size / 1024);
 		return 0;
 	}
+
+	kfree(pages);
 no_pages:
 	kfree(bitmap);
 no_bitmap: