diff options
author | Andi Kleen <ak@suse.de> | 2005-09-13 04:25:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-13 11:22:28 -0400 |
commit | 5b952b3c143660b6436fcb299b249cefde61c18d (patch) | |
tree | 8b0abd6eba79f4fa0f4144ca94d272a0ef826266 /mm | |
parent | 8d0986e289a4b018fec87fcc49538945fb401f37 (diff) |
[PATCH] Fix MPOL_F_VERIFY
There was a pretty bad bug in there that the code would always check the full
VMA, not the range the user requested.
When the VMA to be checked was merged with the previous VMA this could lead to
spurious failures.
Signed-off-by: "Andi Kleen" <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/mempolicy.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c index afa06e184d8..9033f0859aa 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c | |||
@@ -333,8 +333,13 @@ check_range(struct mm_struct *mm, unsigned long start, unsigned long end, | |||
333 | if (prev && prev->vm_end < vma->vm_start) | 333 | if (prev && prev->vm_end < vma->vm_start) |
334 | return ERR_PTR(-EFAULT); | 334 | return ERR_PTR(-EFAULT); |
335 | if ((flags & MPOL_MF_STRICT) && !is_vm_hugetlb_page(vma)) { | 335 | if ((flags & MPOL_MF_STRICT) && !is_vm_hugetlb_page(vma)) { |
336 | unsigned long endvma = vma->vm_end; | ||
337 | if (endvma > end) | ||
338 | endvma = end; | ||
339 | if (vma->vm_start > start) | ||
340 | start = vma->vm_start; | ||
336 | err = check_pgd_range(vma->vm_mm, | 341 | err = check_pgd_range(vma->vm_mm, |
337 | vma->vm_start, vma->vm_end, nodes); | 342 | start, endvma, nodes); |
338 | if (err) { | 343 | if (err) { |
339 | first = ERR_PTR(err); | 344 | first = ERR_PTR(err); |
340 | break; | 345 | break; |