Commit 7b44c3df authored Nov 20, 2015 by Jerome Marchand Committed by Alex Shi Apr 27, 2016

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



Commit 71394fe50146 ("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: Jerome Marchand <jmarchan@redhat.com>
Acked-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 7511c3ede752e6dd67df20779b4e11effe102637)
Signed-off-by: Alex Shi <alex.shi@linaro.org>

parent dbdb6d27

mm/vmalloc.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -1421,7 +1421,6 @@ struct vm_struct remove_vm_area(const void addr)
		vmap_debug_free_range(va->va_start, va->va_end);
		kasan_free_shadow(vm);
		free_unmap_vmap_area(va);
		vm->size -= PAGE_SIZE;

		return vm;
		}
		@@ -1446,8 +1445,8 @@ static void __vunmap(const void *addr, int deallocate_pages)
		return;
		}

		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;