Commit 7511c3ed authored by Jerome Marchand's avatar Jerome Marchand Committed by Linus Torvalds

mm: vmalloc: don't remove inexistent guard hole in remove_vm_area()

Commit 71394fe5 ("mm: vmalloc: add flag preventing guard hole
allocation") missed a spot.  Currently remove_vm_area() decreases vm->size
to "remove" the guard hole page, even when it isn't present.  All but one
users just free the vm_struct rigth away and never access vm->size anyway.

Don't touch the size in remove_vm_area() and have __vunmap() use the
proper get_vm_area_size() helper.
Signed-off-by: default avatarJerome Marchand <>
Acked-by: default avatarAndrey Ryabinin <>
Acked-by: default avatarDavid Rientjes <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 429d4862
......@@ -1443,7 +1443,6 @@ struct vm_struct *remove_vm_area(const void *addr)
vmap_debug_free_range(va->va_start, va->va_end);
vm->size -= PAGE_SIZE;
return vm;
......@@ -1468,8 +1467,8 @@ static void __vunmap(const void *addr, int deallocate_pages)
debug_check_no_locks_freed(addr, area->size);
debug_check_no_obj_freed(addr, area->size);
debug_check_no_locks_freed(addr, get_vm_area_size(area));
debug_check_no_obj_freed(addr, get_vm_area_size(area));
if (deallocate_pages) {
int i;
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