From: Namhyung Kim Date: Wed, 25 May 2011 00:11:25 +0000 (-0700) Subject: mm: nommu: check the vma list when unmapping file-mapped vma X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d75a310c42c616c168953ed45c1091074f97828c;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git mm: nommu: check the vma list when unmapping file-mapped vma Now we have the sorted vma list, use it in do_munmap() to check that we have an exact match. Signed-off-by: Namhyung Kim Acked-by: Greg Ungerer Cc: David Howells Cc: Paul Mundt Cc: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/mm/nommu.c b/mm/nommu.c index e5318f8efde..0563fd9003d 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -1635,7 +1635,6 @@ static int shrink_vma(struct mm_struct *mm, int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) { struct vm_area_struct *vma; - struct rb_node *rb; unsigned long end = start + len; int ret; @@ -1668,9 +1667,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) } if (end == vma->vm_end) goto erase_whole_vma; - rb = rb_next(&vma->vm_rb); - vma = rb_entry(rb, struct vm_area_struct, vm_rb); - } while (rb); + vma = vma->vm_next; + } while (vma); kleave(" = -EINVAL [split file]"); return -EINVAL; } else {