Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbda591d authored by KyongHo's avatar KyongHo Committed by Linus Torvalds
Browse files

mm: fix faulty initialization in vmalloc_init() 



The transfer of ->flags causes some of the static mapping virtual
addresses to be prematurely freed (before the mapping is removed) because
VM_LAZY_FREE gets "set" if tmp->flags has VM_IOREMAP set.  This might
cause subsequent vmalloc/ioremap calls to fail because it might allocate
one of the freed virtual address ranges that aren't unmapped.

va->flags has different types of flags from tmp->flags.  If a region with
VM_IOREMAP set is registered with vm_area_add_early(), it will be removed
by __purge_vmap_area_lazy().

Fix vmalloc_init() to correctly initialize vmap_area for the given
vm_struct.

Also initialise va->vm.  If it is not set, find_vm_area() for the early
vm regions will always fail.

Signed-off-by: default avatarKyongHo Cho <pullip.cho@samsung.com>
Cc: "Olav Haugan" <ohaugan@codeaurora.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 26c19178

mm/vmalloc.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1185,9 +1185,10 @@ void __init vmalloc_init(void) 
	/* Import existing vmlist entries. */

	/* Import existing vmlist entries. */

	for (tmp = vmlist; tmp; tmp = tmp->next) {

	for (tmp = vmlist; tmp; tmp = tmp->next) {

		va = kzalloc(sizeof(struct vmap_area), GFP_NOWAIT);

		va = kzalloc(sizeof(struct vmap_area), GFP_NOWAIT);

		va->flags = tmp->flags | VM_VM_AREA;

		va->flags = VM_VM_AREA;

		va->va_start = (unsigned long)tmp->addr;

		va->va_start = (unsigned long)tmp->addr;

		va->va_end = va->va_start + tmp->size;

		va->va_end = va->va_start + tmp->size;

		va->vm = tmp;

		__insert_vmap_area(va);

		__insert_vmap_area(va);

	}

	}