[kernel] r9995 - in dists/etch/linux-2.6/debian: . patches/bugfix patches/series

[Dann Frazier]

Author: dannf
Date: Fri Dec 21 00:51:19 2007
New Revision: 9995

Log:
* [x86_64] Mask the NX bit in mk_pte_phys to avoid triggering a RSVD type
  page fault on non-NX capable systems which causes a crash, see #414742.

Added:
   dists/etch/linux-2.6/debian/patches/bugfix/x86_64-add-NX-mask-for-PTE-entry.patch
Modified:
   dists/etch/linux-2.6/debian/changelog
   dists/etch/linux-2.6/debian/patches/series/17

Modified: dists/etch/linux-2.6/debian/changelog
==============================================================================
--- dists/etch/linux-2.6/debian/changelog	(original)
+++ dists/etch/linux-2.6/debian/changelog	Fri Dec 21 00:51:19 2007
@@ -2,8 +2,10 @@
 
   * [futex] Fix address computation in compat code, fixing hangs
     on sparc64. (closes: #433187)
+  * [x86_64] Mask the NX bit in mk_pte_phys to avoid triggering a RSVD type
+    page fault on non-NX capable systems which causes a crash, see #414742.
 
- -- dann frazier <dannf at debian.org>  Thu, 08 Nov 2007 09:43:49 -0700
+ -- dann frazier <dannf at debian.org>  Thu, 20 Dec 2007 17:47:37 -0700
 
 linux-2.6 (2.6.18.dfsg.1-16) stable; urgency=high
 

Added: dists/etch/linux-2.6/debian/patches/bugfix/x86_64-add-NX-mask-for-PTE-entry.patch
==============================================================================
--- (empty file)
+++ dists/etch/linux-2.6/debian/patches/bugfix/x86_64-add-NX-mask-for-PTE-entry.patch	Fri Dec 21 00:51:19 2007
@@ -0,0 +1,30 @@
+From: bibo,mao <bibo.mao at intel.com>
+Date: Sat, 21 Oct 2006 16:37:02 +0000 (+0200)
+Subject: [PATCH] x86-64: x86_64 add NX mask for PTE entry
+X-Git-Tag: v2.6.19-rc3~15^2~9
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fstable%2Flinux-2.6.23.y.git;a=commitdiff_plain;h=7a71cef780404e8c90d23b1131142e158d94354b
+
+[PATCH] x86-64: x86_64 add NX mask for PTE entry
+
+    If function change_page_attr_addr calls revert_page to revert
+to original pte value, mk_pte_phys does not mask NX bit. If NX bit
+is set on no NX hardware supported x86_64 machine, there is will
+be RSVD type page fault and system will crash. This patch adds NX
+mask bit for PTE entry.
+
+Signed-off-by: bibo,mao <bibo.mao at intel.com>
+Signed-off-by: Andi Kleen <ak at suse.de>
+---
+
+diff --git a/include/asm-x86_64/pgtable.h b/include/asm-x86_64/pgtable.h
+index 6899e77..0555c1c 100644
+--- a/include/asm-x86_64/pgtable.h
++++ b/include/asm-x86_64/pgtable.h
+@@ -366,6 +366,7 @@ static inline pte_t mk_pte_phys(unsigned long physpage, pgprot_t pgprot)
+ { 
+ 	pte_t pte;
+ 	pte_val(pte) = physpage | pgprot_val(pgprot); 
++	pte_val(pte) &= __supported_pte_mask;
+ 	return pte; 
+ }
+  

Modified: dists/etch/linux-2.6/debian/patches/series/17
==============================================================================
--- dists/etch/linux-2.6/debian/patches/series/17	(original)
+++ dists/etch/linux-2.6/debian/patches/series/17	Fri Dec 21 00:51:19 2007
@@ -1 +1,2 @@
 + bugfix/futex-fix-compat-addr-compute.patch
++ bugfix/x86_64-add-NX-mask-for-PTE-entry.patch