[kernel] r16140 - in dists/lenny-security/linux-2.6/debian/patches: bugfix/all series

[Dann Frazier]

Author: dannf
Date: Sat Aug 14 01:21:09 2010
New Revision: 16140

Log:
mm: fix missing page table unmap for stack guard page failure case

Added:
   dists/lenny-security/linux-2.6/debian/patches/bugfix/all/mm-fix-missing-page-table-unmap-for-stack-guard-page-failure-case.patch
Modified:
   dists/lenny-security/linux-2.6/debian/patches/series/24lenny1

Added: dists/lenny-security/linux-2.6/debian/patches/bugfix/all/mm-fix-missing-page-table-unmap-for-stack-guard-page-failure-case.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny-security/linux-2.6/debian/patches/bugfix/all/mm-fix-missing-page-table-unmap-for-stack-guard-page-failure-case.patch	Sat Aug 14 01:21:09 2010	(r16140)
@@ -0,0 +1,28 @@
+commit 70b3fc3bb866f8d5f5a71d42ddb5486cbf89f2ed
+Author: Linus Torvalds <torvalds at linux-foundation.org>
+Date:   Fri Aug 13 09:24:04 2010 -0700
+
+    mm: fix missing page table unmap for stack guard page failure case
+    
+    .. which didn't show up in my tests because it's a no-op on x86-64 and
+    most other architectures.  But we enter the function with the last-level
+    page table mapped, and should unmap it at exit.
+    
+    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+
+diff --git a/mm/memory.c b/mm/memory.c
+index a1a8e45..659776b 100644
+--- a/mm/memory.c
++++ b/mm/memory.c
+@@ -2309,8 +2309,10 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
+ 	spinlock_t *ptl;
+ 	pte_t entry;
+ 
+-	if (check_stack_guard_page(vma, address) < 0)
++	if (check_stack_guard_page(vma, address) < 0) {
++		pte_unmap(page_table);
+ 		return VM_FAULT_SIGBUS;
++	}
+ 
+ 	/* Allocate our own private page. */
+ 	pte_unmap(page_table);

Modified: dists/lenny-security/linux-2.6/debian/patches/series/24lenny1
==============================================================================
--- dists/lenny-security/linux-2.6/debian/patches/series/24lenny1	Sat Aug 14 00:58:37 2010	(r16139)
+++ dists/lenny-security/linux-2.6/debian/patches/series/24lenny1	Sat Aug 14 01:21:09 2010	(r16140)
@@ -8,3 +8,4 @@
 + bugfix/all/exec-Fix-flush_old_exec-setup_new_exec-split.patch
 + bugfix/all/can-add-limit-for-nframes-and-clean-up-signed-variables.patch
 + bugfix/all/mm-keep-a-guard-page-below-a-grow-down-stack-segment.patch
++ bugfix/all/mm-fix-missing-page-table-unmap-for-stack-guard-page-failure-case.patch