Commit fe8eea4f authored by Joonsoo Kim's avatar Joonsoo Kim Committed by Linus Torvalds
Browse files

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: default avatarJoonsoo Kim <>
Acked-by: default avatarZhang Yanfei <>
Reviewed-by: default avatarMichal Nazarewicz <>
Reviewed-by: default avatarAneesh Kumar K.V <>
Acked-by: default avatarMinchan Kim <>
Cc: "Aneesh Kumar K.V" <>
Cc: Marek Szyprowski <>
Cc: Michal Nazarewicz <>
Cc: Paolo Bonzini <>
Cc: Gleb Natapov <>
Cc: Alexander Graf <>
Cc: Benjamin Herrenschmidt <>
Cc: Paul Mackerras <>
Cc: <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 03787301
......@@ -176,14 +176,24 @@ static int __init cma_activate_area(struct cma *cma)
base_pfn = pfn;
for (j = pageblock_nr_pages; j; --j, pfn++) {
* alloc_contig_range requires the pfn range
* specified to be in the same zone. Make this
* simple by forcing the entire CMA resv range
* to be in the same zone.
if (page_zone(pfn_to_page(pfn)) != zone)
return -EINVAL;
goto err;
} while (--i);
return 0;
return -EINVAL;
static struct cma cma_areas[MAX_CMA_AREAS];
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment