| From dhobsong@igel.co.jp Mon Oct 29 00:54:13 2012 |
| From: Damian Hobson-Garcia <dhobsong@igel.co.jp> |
| Date: Mon, 29 Oct 2012 16:51:15 +0900 |
| Subject: [PATCH v2 58/58] ARM: dma-mapping: Fix potential memory leak in atomic_pool_init() |
| To: greg@kroah.com, laurent.pinchart@ideasonboard.com, horms@verge.net.au |
| Cc: ltsi-dev@lists.linuxfoundation.org, dhobsong@igel.co.jp |
| Message-ID: <1351497075-32717-59-git-send-email-dhobsong@igel.co.jp> |
| |
| |
| From: Sachin Kamat <sachin.kamat@linaro.org> |
| |
| 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> |
| (cherry picked from commit ec10665cbf271fb1f60daeb194ad4f2cdcdc59d9) |
| |
| Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp> |
| --- |
| arch/arm/mm/dma-mapping.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/arch/arm/mm/dma-mapping.c |
| +++ b/arch/arm/mm/dma-mapping.c |
| @@ -345,6 +345,8 @@ static int __init atomic_pool_init(void) |
| (unsigned)pool->size / 1024); |
| return 0; |
| } |
| + |
| + kfree(pages); |
| no_pages: |
| kfree(bitmap); |
| no_bitmap: |
