Permalink
Browse files

Merge branch 'fixes-for-3.6' of git://git.linaro.org/people/mszyprows…

…ki/linux-dma-mapping

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()
  • Loading branch information...
2 parents 3961843 + ec10665 commit b56adb54e825fc548126b20b479d138a683d2b8c @torvalds torvalds committed Sep 27, 2012
Showing with 2 additions and 0 deletions.
  1. +2 −0 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:

0 comments on commit b56adb5

Please sign in to comment.