Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

DMA, CMA: fix possible memory leak

We should free memory for bitmap when we find zone mismatch, otherwise
this memory will leak.

Additionally, I copy code comment from PPC KVM's CMA code to inform why
we need to check zone mis-match.

Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Reviewed-by: Michal Nazarewicz <mina86@mina86.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Acked-by: Minchan Kim <minchan@kernel.org>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Gleb Natapov <gleb@kernel.org>
Cc: Alexander Graf <agraf@suse.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Joonsoo Kim and committed by
Linus Torvalds
fe8eea4f 03787301

+11 -1
+11 -1
drivers/base/dma-contiguous.c
··· 176 176 base_pfn = pfn; 177 177 for (j = pageblock_nr_pages; j; --j, pfn++) { 178 178 WARN_ON_ONCE(!pfn_valid(pfn)); 179 + /* 180 + * alloc_contig_range requires the pfn range 181 + * specified to be in the same zone. Make this 182 + * simple by forcing the entire CMA resv range 183 + * to be in the same zone. 184 + */ 179 185 if (page_zone(pfn_to_page(pfn)) != zone) 180 - return -EINVAL; 186 + goto err; 181 187 } 182 188 init_cma_reserved_pageblock(pfn_to_page(base_pfn)); 183 189 } while (--i); 184 190 185 191 mutex_init(&cma->lock); 186 192 return 0; 193 + 194 + err: 195 + kfree(cma->bitmap); 196 + return -EINVAL; 187 197 } 188 198 189 199 static struct cma cma_areas[MAX_CMA_AREAS];