mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-27 12:57:53 +00:00
Code Issues Releases Wiki Activity

mm: nommu: check the vma list when unmapping file-mapped vma

Browse source 
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 <namhyung@gmail.com>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Namhyung Kim 2011-05-24 17:11:25 -07:00 committed by Linus Torvalds
parent e922c4c536
commit d75a310c42
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mm/nommu.c
View file

@ -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) int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
{ {
struct vm_area_struct *vma; struct vm_area_struct *vma;
struct rb_node *rb;
unsigned long end = start + len; unsigned long end = start + len;
int ret; int ret;
@ -1668,9 +1667,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
} }
if (end == vma->vm_end) if (end == vma->vm_end)
goto erase_whole_vma; goto erase_whole_vma;
rb = rb_next(&vma->vm_rb); vma = vma->vm_next;
vma = rb_entry(rb, struct vm_area_struct, vm_rb); } while (vma);
} while (rb);
kleave(" = -EINVAL [split file]"); kleave(" = -EINVAL [split file]");
return -EINVAL; return -EINVAL;
} else { } else {