packages (GRSECURITY_RAW): kernel/kernel-grsec_full.patch - raw http://www....

[mguevara]

Author: mguevara                     Date: Mon Sep 14 08:19:05 2009 GMT
Module: packages                      Tag: GRSECURITY_RAW
---- Log message:
- raw http://www.grsecurity.net/~spender/grsecurity-2.1.14-2.6.31-200909121002.patch
  more recent version grsecurity-2.1.14-2.6.31-200909121839.patch was commited 
  before 

---- Files affected:
packages/kernel:
   kernel-grsec_full.patch (1.3.2.10 -> 1.3.2.11) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-grsec_full.patch
diff -u packages/kernel/kernel-grsec_full.patch:1.3.2.10 packages/kernel/kernel-grsec_full.patch:1.3.2.11
--- packages/kernel/kernel-grsec_full.patch:1.3.2.10	Mon Sep 14 08:56:05 2009
+++ packages/kernel/kernel-grsec_full.patch	Mon Sep 14 10:18:56 2009
@@ -3391,7 +3391,7 @@
  
 diff -urNp linux-2.6.31/arch/sparc/mm/fault_32.c linux-2.6.31/arch/sparc/mm/fault_32.c
 --- linux-2.6.31/arch/sparc/mm/fault_32.c	2009-08-27 20:59:04.000000000 -0400
-+++ linux-2.6.31/arch/sparc/mm/fault_32.c	2009-09-12 16:46:03.981340680 -0400
++++ linux-2.6.31/arch/sparc/mm/fault_32.c	2009-09-06 15:29:11.154359141 -0400
 @@ -21,6 +21,9 @@
  #include <linux/interrupt.h>
  #include <linux/module.h>
@@ -3402,7 +3402,7 @@
  
  #include <asm/system.h>
  #include <asm/page.h>
-@@ -167,6 +170,265 @@ static unsigned long compute_si_addr(str
+@@ -167,6 +170,264 @@ static unsigned long compute_si_addr(str
  	return safe_compute_effective_address(regs, insn);
  }
  
@@ -3612,7 +3612,6 @@
 +			{
 +				unsigned long addr;
 +
-+				regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
 +				addr = (save & 0x003FFFFFU) << 10;
 +				regs->u_regs[UREG_G2] = addr;
 +				addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
@@ -3668,7 +3667,7 @@
  asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,
  			       unsigned long address)
  {
-@@ -231,6 +493,24 @@ good_area:
+@@ -231,6 +492,24 @@ good_area:
  		if(!(vma->vm_flags & VM_WRITE))
  			goto bad_area;
  	} else {
@@ -15314,7 +15313,7 @@
  		return "[vsyscall]";
 diff -urNp linux-2.6.31/arch/x86/mm/init.c linux-2.6.31/arch/x86/mm/init.c
 --- linux-2.6.31/arch/x86/mm/init.c	2009-08-27 20:59:04.000000000 -0400
-+++ linux-2.6.31/arch/x86/mm/init.c	2009-09-12 18:39:06.077137325 -0400
++++ linux-2.6.31/arch/x86/mm/init.c	2009-09-06 15:29:11.242252166 -0400
 @@ -28,11 +28,11 @@ int direct_gbpages
  #endif
  ;
@@ -15326,7 +15325,7 @@
 -#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
 -static int disable_nx __cpuinitdata;
 -
-+#if defined(CONFIG_X86_PAE) && !defined(CONFIG_PAX_PAGEEXEC)
++#if (defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)) && !defined(CONFIG_PAX_PAGEEXEC)
  /*
   * noexec = on|off
   *
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_full.patch?r1=1.3.2.10&r2=1.3.2.11&f=u