2005-09-15 01:04:57

by Chris Wright

[permalink] [raw]
Subject: [PATCH 09/11] [PATCH] Fix MPOL_F_VERIFY

-stable review patch. If anyone has any objections, please let us know.
------------------

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 <[email protected]>
Signed-off-by: Chris Wright <[email protected]>
---
mm/mempolicy.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletion(-)

Index: linux-2.6.13.y/mm/mempolicy.c
===================================================================
--- linux-2.6.13.y.orig/mm/mempolicy.c
+++ linux-2.6.13.y/mm/mempolicy.c
@@ -333,8 +333,13 @@ check_range(struct mm_struct *mm, unsign
if (prev && prev->vm_end < vma->vm_start)
return ERR_PTR(-EFAULT);
if ((flags & MPOL_MF_STRICT) && !is_vm_hugetlb_page(vma)) {
+ unsigned long endvma = vma->vm_end;
+ if (endvma > end)
+ endvma = end;
+ if (vma->vm_start > start)
+ start = vma->vm_start;
err = check_pgd_range(vma->vm_mm,
- vma->vm_start, vma->vm_end, nodes);
+ start, endvma, nodes);
if (err) {
first = ERR_PTR(err);
break;

--