SOURCES (LINUX_2_6): linux-2.6-grsec_full.patch - merged pax test19

[zbyniu]

Author: zbyniu                       Date: Mon May 26 07:49:32 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- merged pax test19

---- Files affected:
SOURCES:
   linux-2.6-grsec_full.patch (1.1.2.38 -> 1.1.2.39) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-grsec_full.patch
diff -u SOURCES/linux-2.6-grsec_full.patch:1.1.2.38 SOURCES/linux-2.6-grsec_full.patch:1.1.2.39
--- SOURCES/linux-2.6-grsec_full.patch:1.1.2.38	Fri May 23 23:25:50 2008
+++ SOURCES/linux-2.6-grsec_full.patch	Mon May 26 09:49:26 2008
@@ -2350,6 +2350,16 @@
 diff -urNp linux-2.6.25.4/arch/sparc/mm/init.c linux-2.6.25.4/arch/sparc/mm/init.c
 --- linux-2.6.25.4/arch/sparc/mm/init.c	2008-05-15 11:00:12.000000000 -0400
 +++ linux-2.6.25.4/arch/sparc/mm/init.c	2008-05-18 13:33:14.000000000 -0400
+@@ -311,6 +311,9 @@ extern void device_scan(void);
+ pgprot_t PAGE_SHARED __read_mostly;
+ EXPORT_SYMBOL(PAGE_SHARED);
+
++pgprot_t PAGE_SHARED_NOEXEC __read_mostly;
++EXPORT_SYMBOL(PAGE_SHARED_NOEXEC);
++
+ void __init paging_init(void)
+ {      
+ 	switch(sparc_cpu_model) {
 @@ -336,17 +336,17 @@ void __init paging_init(void)
  
  	/* Initialize the protection map with non-constant, MMU dependent values. */
@@ -11040,7 +11050,7 @@
 +		unsigned char flags;
 +
 +		printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
-+		if (address >= 0xFFFF0 || length >= 0xFFFF0 - address || length <= entry) {
++		if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
 +			printk(KERN_WARNING "bios32_service: not valid\n");
  			return 0;
 +		}
@@ -35710,3 +35720,18 @@
  };
  
  static void hardware_enable(void *junk)
+--- e/include/asm-sparc/pgtable.h~	2008-04-17 04:49:44.000000000 +0200
++++ e/include/asm-sparc/pgtable.h	2008-05-24 01:10:57.509956255 +0200
+@@ -50,6 +50,12 @@ BTFIXUPDEF_INT(page_copy)
+ BTFIXUPDEF_INT(page_readonly)
+ BTFIXUPDEF_INT(page_kernel)
+ 
++#ifdef CONFIG_PAX_PAGEEXEC
++BTFIXUPDEF_INT(page_shared_noexec)
++BTFIXUPDEF_INT(page_copy_noexec)
++BTFIXUPDEF_INT(page_readonly_noexec)
++#endif
++
+ #define PMD_SHIFT		SUN4C_PMD_SHIFT
+ #define PMD_SIZE        	(1UL << PMD_SHIFT)
+ #define PMD_MASK        	(~(PMD_SIZE-1))
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-grsec_full.patch?r1=1.1.2.38&r2=1.1.2.39&f=u