Patchwork [2/3] vm: fix vm_pgoff wrap in stack expansion - CVE-2011-2496

login
register
mail settings
Submitter Paolo Pisati
Date Oct. 11, 2011, 2:17 p.m.
Message ID <1318342628-32016-3-git-send-email-paolo.pisati@canonical.com>
Download mbox | patch
Permalink /patch/118990/
State New
Headers show

Comments

Paolo Pisati - Oct. 11, 2011, 2:17 p.m.
From: Linus Torvalds <torvalds@linux-foundation.org>

vm: fix vm_pgoff wrap in stack expansion

Commit 982134ba6261 ("mm: avoid wrapping vm_pgoff in mremap()") fixed
the case of a expanding mapping causing vm_pgoff wrapping when you used
mremap.  But there was another case where we expand mappings hiding in
plain sight: the automatic stack expansion.

This fixes that case too.

This one also found by Robert Święcki, using his nasty system call
fuzzer tool.  Good job.

BugLink: http://bugs.launchpad.net/bugs/869243

commit upstream a626ca6a656450e9f4df91d0dda238fff23285f4

Reported-and-tested-by: Robert Święcki <robert@swiecki.net>
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
---
 mm/mmap.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

Patch

diff --git a/mm/mmap.c b/mm/mmap.c
index 974ecc0..dcd3dcc 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1644,10 +1644,13 @@  static inline int expand_downwards(struct vm_area_struct *vma,
 		size = vma->vm_end - address;
 		grow = (vma->vm_start - address) >> PAGE_SHIFT;
 
-		error = acct_stack_growth(vma, size, grow);
-		if (!error) {
-			vma->vm_start = address;
-			vma->vm_pgoff -= grow;
+		error = -ENOMEM;
+		if (grow <= vma->vm_pgoff) {
+			error = acct_stack_growth(vma, size, grow);
+			if (!error) {
+				vma->vm_start = address;
+				vma->vm_pgoff -= grow;
+			}
 		}
 	}
 	anon_vma_unlock(vma);