lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

Browse Source 
Pull ARM dma-mapping fix from Marek Szyprowski:
 "This patch fixes a potential memory leak in the ARM dma-mapping code."

* 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  ARM: dma-mapping: Fix potential memory leak in atomic_pool_init()
This commit is contained in:
Linus Torvalds
2012-09-27 15:46:04 -07:00
parent 39618435a0 ec10665cbf
commit b56adb54e8
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mm/dma-mapping.c
View File

@@ -346,6 +346,8 @@ static int __init atomic_pool_init(void)
(unsigned)pool->size / 1024); (unsigned)pool->size / 1024);
return 0; return 0;
} }
kfree(pages);
no_pages: no_pages:
kfree(bitmap); kfree(bitmap);
no_bitmap: no_bitmap: