SOURCES (LINUX_2_6_20): pax-linux-2.6.20.patch - applied changes f...

[mguevara]

Author: mguevara                     Date: Mon Mar 12 22:51:59 2007 GMT
Module: SOURCES                       Tag: LINUX_2_6_20
---- Log message:
- applied changes from http://www.grsecurity.net/~paxguy1/pax-linux-2.6.20.2-test7.patch

---- Files affected:
SOURCES:
   pax-linux-2.6.20.patch (1.1.2.11 -> 1.1.2.12) 

---- Diffs:

================================================================
Index: SOURCES/pax-linux-2.6.20.patch
diff -u SOURCES/pax-linux-2.6.20.patch:1.1.2.11 SOURCES/pax-linux-2.6.20.patch:1.1.2.12
--- SOURCES/pax-linux-2.6.20.patch:1.1.2.11	Sun Mar 11 00:03:59 2007
+++ SOURCES/pax-linux-2.6.20.patch	Mon Mar 12 23:51:54 2007
@@ -6090,6 +6090,21 @@
  }
  
  #if defined(CONFIG_SOFTWARE_SUSPEND) || defined(CONFIG_ACPI_SLEEP)
+@@ -388,12 +358,12 @@ static void __init pagetable_init (void)
+  * Swap suspend & friends need this for resume because things like the intel-agp
+  * driver might have split up a kernel 4MB mapping.
+  */
+-char __nosavedata swsusp_pg_dir[PAGE_SIZE]
++pgd_t __nosavedata swsusp_pg_dir[PTRS_PER_PGD]
+ 	__attribute__ ((aligned (PAGE_SIZE)));
+ 
+ static inline void save_pg_dir(void)
+ {
+-	memcpy(swsusp_pg_dir, swapper_pg_dir, PAGE_SIZE);
++	clone_pgd_range(swsusp_pg_dir, swapper_pg_dir, PTRS_PER_PGD);
+ }
+ #else
+ static inline void save_pg_dir(void)
 @@ -422,7 +392,6 @@ void zap_low_mappings (void)
  	flush_tlb_all();
  }
@@ -7728,7 +7743,7 @@
  
  #include <asm/page.h>
  #include <asm/pgtable.h>
-@@ -48,6 +53,379 @@ unsigned long pte_misses;	/* updated by 
+@@ -48,6 +53,364 @@ unsigned long pte_misses;	/* updated by 
  unsigned long pte_errors;	/* updated by do_page_fault() */
  unsigned int probingmem;
  
@@ -8069,21 +8084,6 @@
 +			return 6;
 +		}
 +	} while (0);
-+#endif
-+
-+	return 1;
-+}
-+
-+/*
-+ * PaX: decide what to do with offenders (regs->nip = fault address)
-+ *
-+ * returns 1 when task should be killed
-+ */
-+static int pax_handle_fetch_fault(struct pt_regs *regs)
-+{
-+
-+#if defined(CONFIG_PAX_EMUPLT) || defined(CONFIG_PAX_EMUSIGRT)
-+	int err;
 +#endif
 +
 +	return 1;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/pax-linux-2.6.20.patch?r1=1.1.2.11&r2=1.1.2.12&f=u