[kernel] r16138 - dists/lenny-security/linux-2.6/debian/patches/features/all/openvz

[Dann Frazier]

Author: dannf
Date: Sat Aug 14 00:49:39 2010
New Revision: 16138

Log:
Adjust to apply on top of guard page patch

Modified:
   dists/lenny-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch

Modified: dists/lenny-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch
==============================================================================
--- dists/lenny-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Sat Aug 14 00:49:23 2010	(r16137)
+++ dists/lenny-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Sat Aug 14 00:49:39 2010	(r16138)
@@ -67104,12 +67104,15 @@
  	unlock_page(page);
  	page_cache_release(page);
  	return ret;
-@@ -2288,10 +2370,14 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2308,6 +2390,7 @@ static int do_anonymous_page(struct mm_s
  	struct page *page;
  	spinlock_t *ptl;
  	pte_t entry;
 +	struct page_beancounter *pbc;
  
+ 	if (check_stack_guard_page(vma, address) < 0)
+ 		return VM_FAULT_SIGBUS;
+@@ -2315,6 +2398,9 @@ static int do_anonymous_page(struct mm_s
  	/* Allocate our own private page. */
  	pte_unmap(page_table);