summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyongHo <pullip.cho@samsung.com>2012-05-29 15:06:49 -0700
committerRajanikanth H.V <rajanikanth.hv@stericsson.com>2012-12-14 17:07:22 +0530
commit189d8bcf68bddebe0b26a1da9629e3473ca1bd48 (patch)
treed109aa01e00d2ca4d46537df5175a27f6148936f
parent7bf8cb67215c87b5c76e6cc954a36d7ad6fee57b (diff)
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: KyongHo Cho <pullip.cho@samsung.com> Cc: "Olav Haugan" <ohaugan@codeaurora.org> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> ST-Ericsson ID: 440451 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: If5af5590d9dcd08048df2af31424a99e189be838 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/63748 Tested-by: Rabin VINCENT <rabin.vincent@stericsson.com> Reviewed-by: Shreshtha Kumar SAHU <shreshthakumar.sahu@stericsson.com> Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com>
-rw-r--r--mm/vmalloc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 94dff883b44..1196c7728ed 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -1185,9 +1185,10 @@ void __init vmalloc_init(void)
/* Import existing vmlist entries. */
for (tmp = vmlist; tmp; tmp = tmp->next) {
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_end = va->va_start + tmp->size;
+ va->vm = tmp;
__insert_vmap_area(va);
}