projects/linux·commit e0a04cff

[PATCH] mincore: vma crossing fix

e0a04cff · Nick Piggin <[email protected]> · 2007-02-14 12:39:01 +01:00

My mincore also forgot about crossing vmas.

Signed-off-by: Nick Piggin <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
e0a04cffa4e97e1e53625e40e70895c882e8972f
Parents
4a76ef03

Changes

1 files changed · +10 −2

FileStatusAddDelContent
mm/mincore.cmodified+10−2View file

mm/mincore.c

View file
diff --git a/mm/mincore.c b/mm/mincore.c
index 9c1d0a4..5efe0de 100644
--- a/mm/mincore.c
+++ b/mm/mincore.c
@@ -77,8 +77,16 @@ static long do_mincore(unsigned long addr, unsigned char *vec, unsigned long pag
* PTE array for our address.
*/
nr = PTRS_PER_PTE - ((addr >> PAGE_SHIFT) & (PTRS_PER_PTE-1));
- if (nr > pages)
- nr = pages;
+
+ /*
+ * Don't overrun this vma
+ */
+ nr = min(nr, (vma->vm_end - addr) >> PAGE_SHIFT);
+
+ /*
+ * Don't return more than the caller asked for
+ */
+ nr = min(nr, pages);
pgd = pgd_offset(vma->vm_mm, addr);
if (pgd_none_or_clear_bad(pgd))