packages: kernel/kernel-grsec_full.patch, kernel/kernel.spec - update grsec...

arekm arekm at pld-linux.org
Thu Nov 17 20:16:44 CET 2011 

Author: arekm                        Date: Thu Nov 17 19:16:44 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update grsec to 2.2.2-3.1.1-201111170037.patch

---- Files affected:
packages/kernel:
   kernel-grsec_full.patch (1.86 -> 1.87) , kernel.spec (1.999 -> 1.1000) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-grsec_full.patch
diff -u packages/kernel/kernel-grsec_full.patch:1.86 packages/kernel/kernel-grsec_full.patch:1.87
--- packages/kernel/kernel-grsec_full.patch:1.86	Thu Nov 10 08:42:58 2011
+++ packages/kernel/kernel-grsec_full.patch	Thu Nov 17 20:16:35 2011
@@ -1,6 +1,6 @@
-diff -urNp linux-3.0.8/arch/alpha/include/asm/elf.h linux-3.0.8/arch/alpha/include/asm/elf.h
---- linux-3.0.8/arch/alpha/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/alpha/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/alpha/include/asm/elf.h linux-3.1.1/arch/alpha/include/asm/elf.h
+--- linux-3.1.1/arch/alpha/include/asm/elf.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/alpha/include/asm/elf.h	2011-11-16 18:39:07.000000000 -0500
 @@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x1000000)
@@ -15,9 +15,9 @@
  /* $0 is set by ld.so to a pointer to a function which might be 
     registered using atexit.  This provides a mean for the dynamic
     linker to call DT_FINI functions for shared libraries that have
-diff -urNp linux-3.0.8/arch/alpha/include/asm/pgtable.h linux-3.0.8/arch/alpha/include/asm/pgtable.h
---- linux-3.0.8/arch/alpha/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/alpha/include/asm/pgtable.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/alpha/include/asm/pgtable.h linux-3.1.1/arch/alpha/include/asm/pgtable.h
+--- linux-3.1.1/arch/alpha/include/asm/pgtable.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/alpha/include/asm/pgtable.h	2011-11-16 18:39:07.000000000 -0500
 @@ -101,6 +101,17 @@ struct vm_area_struct;
  #define PAGE_SHARED	__pgprot(_PAGE_VALID | __ACCESS_BITS)
  #define PAGE_COPY	__pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
@@ -36,10 +36,10 @@
  #define PAGE_KERNEL	__pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
  
  #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
-diff -urNp linux-3.0.8/arch/alpha/kernel/module.c linux-3.0.8/arch/alpha/kernel/module.c
---- linux-3.0.8/arch/alpha/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/alpha/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
-@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, 
+diff -urNp linux-3.1.1/arch/alpha/kernel/module.c linux-3.1.1/arch/alpha/kernel/module.c
+--- linux-3.1.1/arch/alpha/kernel/module.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/alpha/kernel/module.c	2011-11-16 18:39:07.000000000 -0500
+@@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, 
  
  	/* The small sections were sorted to the end of the segment.
  	   The following should definitely cover them.  */
@@ -48,10 +48,10 @@
  	got = sechdrs[me->arch.gotsecindex].sh_addr;
  
  	for (i = 0; i < n; i++) {
-diff -urNp linux-3.0.8/arch/alpha/kernel/osf_sys.c linux-3.0.8/arch/alpha/kernel/osf_sys.c
---- linux-3.0.8/arch/alpha/kernel/osf_sys.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/alpha/kernel/osf_sys.c	2011-08-23 21:47:55.000000000 -0400
-@@ -1145,7 +1145,7 @@ arch_get_unmapped_area_1(unsigned long a
+diff -urNp linux-3.1.1/arch/alpha/kernel/osf_sys.c linux-3.1.1/arch/alpha/kernel/osf_sys.c
+--- linux-3.1.1/arch/alpha/kernel/osf_sys.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/alpha/kernel/osf_sys.c	2011-11-16 18:39:07.000000000 -0500
+@@ -1147,7 +1147,7 @@ arch_get_unmapped_area_1(unsigned long a
  		/* At this point:  (!vma || addr < vma->vm_end). */
  		if (limit - len < addr)
  			return -ENOMEM;
@@ -60,7 +60,7 @@
  			return addr;
  		addr = vma->vm_end;
  		vma = vma->vm_next;
-@@ -1181,6 +1181,10 @@ arch_get_unmapped_area(struct file *filp
+@@ -1183,6 +1183,10 @@ arch_get_unmapped_area(struct file *filp
  	   merely specific addresses, but regions of memory -- perhaps
  	   this feature should be incorporated into all ports?  */
  
@@ -71,7 +71,7 @@
  	if (addr) {
  		addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
  		if (addr != (unsigned long) -ENOMEM)
-@@ -1188,8 +1192,8 @@ arch_get_unmapped_area(struct file *filp
+@@ -1190,8 +1194,8 @@ arch_get_unmapped_area(struct file *filp
  	}
  
  	/* Next, try allocating at TASK_UNMAPPED_BASE.  */
@@ -82,9 +82,9 @@
  	if (addr != (unsigned long) -ENOMEM)
  		return addr;
  
-diff -urNp linux-3.0.8/arch/alpha/mm/fault.c linux-3.0.8/arch/alpha/mm/fault.c
---- linux-3.0.8/arch/alpha/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/alpha/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/alpha/mm/fault.c linux-3.1.1/arch/alpha/mm/fault.c
+--- linux-3.1.1/arch/alpha/mm/fault.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/alpha/mm/fault.c	2011-11-16 18:39:07.000000000 -0500
 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
  	__reload_thread(pcb);
  }
@@ -192,7 +192,7 @@
 +	return 1;
 +}
 +
-+void pax_report_insns(void *pc, void *sp)
++void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
 +{
 +	unsigned long i;
 +
@@ -241,9 +241,9 @@
  	} else if (!cause) {
  		/* Allow reads even for write-only mappings */
  		if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-3.0.8/arch/arm/include/asm/elf.h linux-3.0.8/arch/arm/include/asm/elf.h
---- linux-3.0.8/arch/arm/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/arm/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/include/asm/elf.h linux-3.1.1/arch/arm/include/asm/elf.h
+--- linux-3.1.1/arch/arm/include/asm/elf.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/include/asm/elf.h	2011-11-16 18:39:07.000000000 -0500
 @@ -116,7 +116,14 @@ int dump_task_regs(struct task_struct *t
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -271,9 +271,9 @@
  extern int vectors_user_mapping(void);
  #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping()
  #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
-diff -urNp linux-3.0.8/arch/arm/include/asm/kmap_types.h linux-3.0.8/arch/arm/include/asm/kmap_types.h
---- linux-3.0.8/arch/arm/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/arm/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/include/asm/kmap_types.h linux-3.1.1/arch/arm/include/asm/kmap_types.h
+--- linux-3.1.1/arch/arm/include/asm/kmap_types.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/include/asm/kmap_types.h	2011-11-16 18:39:07.000000000 -0500
 @@ -21,6 +21,7 @@ enum km_type {
  	KM_L1_CACHE,
  	KM_L2_CACHE,
@@ -282,9 +282,9 @@
  	KM_TYPE_NR
  };
  
-diff -urNp linux-3.0.8/arch/arm/include/asm/uaccess.h linux-3.0.8/arch/arm/include/asm/uaccess.h
---- linux-3.0.8/arch/arm/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/arm/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/include/asm/uaccess.h linux-3.1.1/arch/arm/include/asm/uaccess.h
+--- linux-3.1.1/arch/arm/include/asm/uaccess.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/include/asm/uaccess.h	2011-11-16 18:39:07.000000000 -0500
 @@ -22,6 +22,8 @@
  #define VERIFY_READ 0
  #define VERIFY_WRITE 1
@@ -340,9 +340,9 @@
  	if (access_ok(VERIFY_WRITE, to, n))
  		n = __copy_to_user(to, from, n);
  	return n;
-diff -urNp linux-3.0.8/arch/arm/kernel/armksyms.c linux-3.0.8/arch/arm/kernel/armksyms.c
---- linux-3.0.8/arch/arm/kernel/armksyms.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/arm/kernel/armksyms.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/kernel/armksyms.c linux-3.1.1/arch/arm/kernel/armksyms.c
+--- linux-3.1.1/arch/arm/kernel/armksyms.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/kernel/armksyms.c	2011-11-16 18:39:07.000000000 -0500
 @@ -98,8 +98,8 @@ EXPORT_SYMBOL(__strncpy_from_user);
  #ifdef CONFIG_MMU
  EXPORT_SYMBOL(copy_page);
@@ -354,18 +354,18 @@
  EXPORT_SYMBOL(__clear_user);
  
  EXPORT_SYMBOL(__get_user_1);
-diff -urNp linux-3.0.8/arch/arm/kernel/process.c linux-3.0.8/arch/arm/kernel/process.c
---- linux-3.0.8/arch/arm/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/arm/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/kernel/process.c linux-3.1.1/arch/arm/kernel/process.c
+--- linux-3.1.1/arch/arm/kernel/process.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/kernel/process.c	2011-11-16 18:39:07.000000000 -0500
 @@ -28,7 +28,6 @@
  #include <linux/tick.h>
  #include <linux/utsname.h>
  #include <linux/uaccess.h>
 -#include <linux/random.h>
  #include <linux/hw_breakpoint.h>
+ #include <linux/cpuidle.h>
  
- #include <asm/cacheflush.h>
-@@ -479,12 +478,6 @@ unsigned long get_wchan(struct task_stru
+@@ -481,12 +480,6 @@ unsigned long get_wchan(struct task_stru
  	return 0;
  }
  
@@ -378,9 +378,9 @@
  #ifdef CONFIG_MMU
  /*
   * The vectors page is always readable from user space for the
-diff -urNp linux-3.0.8/arch/arm/kernel/traps.c linux-3.0.8/arch/arm/kernel/traps.c
---- linux-3.0.8/arch/arm/kernel/traps.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/arm/kernel/traps.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/kernel/traps.c linux-3.1.1/arch/arm/kernel/traps.c
+--- linux-3.1.1/arch/arm/kernel/traps.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/kernel/traps.c	2011-11-16 18:40:08.000000000 -0500
 @@ -257,6 +257,8 @@ static int __die(const char *str, int er
  
  static DEFINE_SPINLOCK(die_lock);
@@ -400,9 +400,9 @@
  	if (ret != NOTIFY_STOP)
  		do_exit(SIGSEGV);
  }
-diff -urNp linux-3.0.8/arch/arm/lib/copy_from_user.S linux-3.0.8/arch/arm/lib/copy_from_user.S
---- linux-3.0.8/arch/arm/lib/copy_from_user.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/arm/lib/copy_from_user.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/lib/copy_from_user.S linux-3.1.1/arch/arm/lib/copy_from_user.S
+--- linux-3.1.1/arch/arm/lib/copy_from_user.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/lib/copy_from_user.S	2011-11-16 18:39:07.000000000 -0500
 @@ -16,7 +16,7 @@
  /*
   * Prototype:
@@ -426,9 +426,9 @@
  
  	.pushsection .fixup,"ax"
  	.align 0
-diff -urNp linux-3.0.8/arch/arm/lib/copy_to_user.S linux-3.0.8/arch/arm/lib/copy_to_user.S
---- linux-3.0.8/arch/arm/lib/copy_to_user.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/arm/lib/copy_to_user.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/lib/copy_to_user.S linux-3.1.1/arch/arm/lib/copy_to_user.S
+--- linux-3.1.1/arch/arm/lib/copy_to_user.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/lib/copy_to_user.S	2011-11-16 18:39:07.000000000 -0500
 @@ -16,7 +16,7 @@
  /*
   * Prototype:
@@ -452,9 +452,9 @@
  ENDPROC(__copy_to_user_std)
  
  	.pushsection .fixup,"ax"
-diff -urNp linux-3.0.8/arch/arm/lib/uaccess.S linux-3.0.8/arch/arm/lib/uaccess.S
---- linux-3.0.8/arch/arm/lib/uaccess.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/arm/lib/uaccess.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/lib/uaccess.S linux-3.1.1/arch/arm/lib/uaccess.S
+--- linux-3.1.1/arch/arm/lib/uaccess.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/lib/uaccess.S	2011-11-16 18:39:07.000000000 -0500
 @@ -20,7 +20,7 @@
  
  #define PAGE_SHIFT 12
@@ -508,9 +508,9 @@
  
  		.pushsection .fixup,"ax"
  		.align	0
-diff -urNp linux-3.0.8/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.8/arch/arm/lib/uaccess_with_memcpy.c
---- linux-3.0.8/arch/arm/lib/uaccess_with_memcpy.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/arm/lib/uaccess_with_memcpy.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/lib/uaccess_with_memcpy.c linux-3.1.1/arch/arm/lib/uaccess_with_memcpy.c
+--- linux-3.1.1/arch/arm/lib/uaccess_with_memcpy.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/lib/uaccess_with_memcpy.c	2011-11-16 18:39:07.000000000 -0500
 @@ -103,7 +103,7 @@ out:
  }
  
@@ -520,9 +520,9 @@
  {
  	/*
  	 * This test is stubbed out of the main function above to keep
-diff -urNp linux-3.0.8/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.8/arch/arm/mach-ux500/mbox-db5500.c
---- linux-3.0.8/arch/arm/mach-ux500/mbox-db5500.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/arm/mach-ux500/mbox-db5500.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/mach-ux500/mbox-db5500.c linux-3.1.1/arch/arm/mach-ux500/mbox-db5500.c
+--- linux-3.1.1/arch/arm/mach-ux500/mbox-db5500.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/mach-ux500/mbox-db5500.c	2011-11-16 18:40:08.000000000 -0500
 @@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct dev
  	return sprintf(buf, "0x%X\n", mbox_value);
  }
@@ -532,9 +532,9 @@
  
  static int mbox_show(struct seq_file *s, void *data)
  {
-diff -urNp linux-3.0.8/arch/arm/mm/fault.c linux-3.0.8/arch/arm/mm/fault.c
---- linux-3.0.8/arch/arm/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/arm/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/mm/fault.c linux-3.1.1/arch/arm/mm/fault.c
+--- linux-3.1.1/arch/arm/mm/fault.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/mm/fault.c	2011-11-16 18:39:07.000000000 -0500
 @@ -182,6 +182,13 @@ __do_user_fault(struct task_struct *tsk,
  	}
  #endif
@@ -549,12 +549,12 @@
  	tsk->thread.address = addr;
  	tsk->thread.error_code = fsr;
  	tsk->thread.trap_no = 14;
-@@ -379,6 +386,33 @@ do_page_fault(unsigned long addr, unsign
+@@ -383,6 +390,33 @@ do_page_fault(unsigned long addr, unsign
  }
  #endif					/* CONFIG_MMU */
  
 +#ifdef CONFIG_PAX_PAGEEXEC
-+void pax_report_insns(void *pc, void *sp)
++void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
 +{
 +	long i;
 +
@@ -583,9 +583,9 @@
  /*
   * First Level Translation Fault Handler
   *
-diff -urNp linux-3.0.8/arch/arm/mm/mmap.c linux-3.0.8/arch/arm/mm/mmap.c
---- linux-3.0.8/arch/arm/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/arm/mm/mmap.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/mm/mmap.c linux-3.1.1/arch/arm/mm/mmap.c
+--- linux-3.1.1/arch/arm/mm/mmap.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/mm/mmap.c	2011-11-16 18:39:07.000000000 -0500
 @@ -65,6 +65,10 @@ arch_get_unmapped_area(struct file *filp
  	if (len > TASK_SIZE)
  		return -ENOMEM;
@@ -635,9 +635,9 @@
  			/*
  			 * Remember the place where we stopped the search:
  			 */
-diff -urNp linux-3.0.8/arch/avr32/include/asm/elf.h linux-3.0.8/arch/avr32/include/asm/elf.h
---- linux-3.0.8/arch/avr32/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/avr32/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/avr32/include/asm/elf.h linux-3.1.1/arch/avr32/include/asm/elf.h
+--- linux-3.1.1/arch/avr32/include/asm/elf.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/avr32/include/asm/elf.h	2011-11-16 18:39:07.000000000 -0500
 @@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpreg
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -654,9 +654,9 @@
  
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports.  This could be done in user space,
-diff -urNp linux-3.0.8/arch/avr32/include/asm/kmap_types.h linux-3.0.8/arch/avr32/include/asm/kmap_types.h
---- linux-3.0.8/arch/avr32/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/avr32/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/avr32/include/asm/kmap_types.h linux-3.1.1/arch/avr32/include/asm/kmap_types.h
+--- linux-3.1.1/arch/avr32/include/asm/kmap_types.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/avr32/include/asm/kmap_types.h	2011-11-16 18:39:07.000000000 -0500
 @@ -22,7 +22,8 @@ D(10)	KM_IRQ0,
  D(11)	KM_IRQ1,
  D(12)	KM_SOFTIRQ0,
@@ -667,15 +667,15 @@
  };
  
  #undef D
-diff -urNp linux-3.0.8/arch/avr32/mm/fault.c linux-3.0.8/arch/avr32/mm/fault.c
---- linux-3.0.8/arch/avr32/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/avr32/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/avr32/mm/fault.c linux-3.1.1/arch/avr32/mm/fault.c
+--- linux-3.1.1/arch/avr32/mm/fault.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/avr32/mm/fault.c	2011-11-16 18:39:07.000000000 -0500
 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
  
  int exception_trace = 1;
  
 +#ifdef CONFIG_PAX_PAGEEXEC
-+void pax_report_insns(void *pc, void *sp)
++void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
 +{
 +	unsigned long i;
 +
@@ -711,9 +711,9 @@
  		if (exception_trace && printk_ratelimit())
  			printk("%s%s[%d]: segfault at %08lx pc %08lx "
  			       "sp %08lx ecr %lu\n",
-diff -urNp linux-3.0.8/arch/frv/include/asm/kmap_types.h linux-3.0.8/arch/frv/include/asm/kmap_types.h
---- linux-3.0.8/arch/frv/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/frv/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/frv/include/asm/kmap_types.h linux-3.1.1/arch/frv/include/asm/kmap_types.h
+--- linux-3.1.1/arch/frv/include/asm/kmap_types.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/frv/include/asm/kmap_types.h	2011-11-16 18:39:07.000000000 -0500
 @@ -23,6 +23,7 @@ enum km_type {
  	KM_IRQ1,
  	KM_SOFTIRQ0,
@@ -722,9 +722,9 @@
  	KM_TYPE_NR
  };
  
-diff -urNp linux-3.0.8/arch/frv/mm/elf-fdpic.c linux-3.0.8/arch/frv/mm/elf-fdpic.c
---- linux-3.0.8/arch/frv/mm/elf-fdpic.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/frv/mm/elf-fdpic.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/frv/mm/elf-fdpic.c linux-3.1.1/arch/frv/mm/elf-fdpic.c
+--- linux-3.1.1/arch/frv/mm/elf-fdpic.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/frv/mm/elf-fdpic.c	2011-11-16 18:39:07.000000000 -0500
 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
  	if (addr) {
  		addr = PAGE_ALIGN(addr);
@@ -753,9 +753,9 @@
  				goto success;
  			addr = vma->vm_end;
  		}
-diff -urNp linux-3.0.8/arch/ia64/include/asm/elf.h linux-3.0.8/arch/ia64/include/asm/elf.h
---- linux-3.0.8/arch/ia64/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/ia64/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/ia64/include/asm/elf.h linux-3.1.1/arch/ia64/include/asm/elf.h
+--- linux-3.1.1/arch/ia64/include/asm/elf.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/include/asm/elf.h	2011-11-16 18:39:07.000000000 -0500
 @@ -42,6 +42,13 @@
   */
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -770,9 +770,9 @@
  #define PT_IA_64_UNWIND		0x70000001
  
  /* IA-64 relocations: */
-diff -urNp linux-3.0.8/arch/ia64/include/asm/pgtable.h linux-3.0.8/arch/ia64/include/asm/pgtable.h
---- linux-3.0.8/arch/ia64/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/ia64/include/asm/pgtable.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/ia64/include/asm/pgtable.h linux-3.1.1/arch/ia64/include/asm/pgtable.h
+--- linux-3.1.1/arch/ia64/include/asm/pgtable.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/include/asm/pgtable.h	2011-11-16 18:39:07.000000000 -0500
 @@ -12,7 +12,7 @@
   *	David Mosberger-Tang <davidm at hpl.hp.com>
   */
@@ -800,9 +800,9 @@
  #define PAGE_GATE	__pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
  #define PAGE_KERNEL	__pgprot(__DIRTY_BITS  | _PAGE_PL_0 | _PAGE_AR_RWX)
  #define PAGE_KERNELRX	__pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
-diff -urNp linux-3.0.8/arch/ia64/include/asm/spinlock.h linux-3.0.8/arch/ia64/include/asm/spinlock.h
---- linux-3.0.8/arch/ia64/include/asm/spinlock.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/ia64/include/asm/spinlock.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/ia64/include/asm/spinlock.h linux-3.1.1/arch/ia64/include/asm/spinlock.h
+--- linux-3.1.1/arch/ia64/include/asm/spinlock.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/include/asm/spinlock.h	2011-11-16 18:39:07.000000000 -0500
 @@ -72,7 +72,7 @@ static __always_inline void __ticket_spi
  	unsigned short	*p = (unsigned short *)&lock->lock + 1, tmp;
  
@@ -812,9 +812,9 @@
  }
  
  static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
-diff -urNp linux-3.0.8/arch/ia64/include/asm/uaccess.h linux-3.0.8/arch/ia64/include/asm/uaccess.h
---- linux-3.0.8/arch/ia64/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/ia64/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/ia64/include/asm/uaccess.h linux-3.1.1/arch/ia64/include/asm/uaccess.h
+--- linux-3.1.1/arch/ia64/include/asm/uaccess.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/include/asm/uaccess.h	2011-11-16 18:39:07.000000000 -0500
 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
  	const void *__cu_from = (from);							\
  	long __cu_len = (n);								\
@@ -833,10 +833,10 @@
  		__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len);	\
  	__cu_len;									\
  })
-diff -urNp linux-3.0.8/arch/ia64/kernel/module.c linux-3.0.8/arch/ia64/kernel/module.c
---- linux-3.0.8/arch/ia64/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/ia64/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
-@@ -315,8 +315,7 @@ module_alloc (unsigned long size)
+diff -urNp linux-3.1.1/arch/ia64/kernel/module.c linux-3.1.1/arch/ia64/kernel/module.c
+--- linux-3.1.1/arch/ia64/kernel/module.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/kernel/module.c	2011-11-16 18:39:07.000000000 -0500
+@@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
  void
  module_free (struct module *mod, void *module_region)
  {
@@ -846,7 +846,7 @@
  		unw_remove_unwind_table(mod->arch.init_unw_table);
  		mod->arch.init_unw_table = NULL;
  	}
-@@ -502,15 +501,39 @@ module_frob_arch_sections (Elf_Ehdr *ehd
+@@ -494,15 +493,39 @@ module_frob_arch_sections (Elf_Ehdr *ehd
  }
  
  static inline int
@@ -888,7 +888,7 @@
  }
  
  static inline int
-@@ -693,7 +716,14 @@ do_reloc (struct module *mod, uint8_t r_
+@@ -685,7 +708,14 @@ do_reloc (struct module *mod, uint8_t r_
  		break;
  
  	      case RV_BDREL:
@@ -904,7 +904,7 @@
  		break;
  
  	      case RV_LTV:
-@@ -828,15 +858,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs,
+@@ -820,15 +850,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs,
  		 *     addresses have been selected...
  		 */
  		uint64_t gp;
@@ -924,9 +924,9 @@
  		mod->arch.gp = gp;
  		DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
  	}
-diff -urNp linux-3.0.8/arch/ia64/kernel/sys_ia64.c linux-3.0.8/arch/ia64/kernel/sys_ia64.c
---- linux-3.0.8/arch/ia64/kernel/sys_ia64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/ia64/kernel/sys_ia64.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/ia64/kernel/sys_ia64.c linux-3.1.1/arch/ia64/kernel/sys_ia64.c
+--- linux-3.1.1/arch/ia64/kernel/sys_ia64.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/kernel/sys_ia64.c	2011-11-16 18:39:07.000000000 -0500
 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
  	if (REGION_NUMBER(addr) == RGN_HPAGE)
  		addr = 0;
@@ -959,9 +959,9 @@
  			/* Remember the address where we stopped this search:  */
  			mm->free_area_cache = addr + len;
  			return addr;
-diff -urNp linux-3.0.8/arch/ia64/kernel/vmlinux.lds.S linux-3.0.8/arch/ia64/kernel/vmlinux.lds.S
---- linux-3.0.8/arch/ia64/kernel/vmlinux.lds.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/ia64/kernel/vmlinux.lds.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/ia64/kernel/vmlinux.lds.S linux-3.1.1/arch/ia64/kernel/vmlinux.lds.S
+--- linux-3.1.1/arch/ia64/kernel/vmlinux.lds.S	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/kernel/vmlinux.lds.S	2011-11-16 18:39:07.000000000 -0500
 @@ -199,7 +199,7 @@ SECTIONS {
  	/* Per-cpu data: */
  	. = ALIGN(PERCPU_PAGE_SIZE);
@@ -971,15 +971,15 @@
  	/*
  	 * ensure percpu data fits
  	 * into percpu page size
-diff -urNp linux-3.0.8/arch/ia64/mm/fault.c linux-3.0.8/arch/ia64/mm/fault.c
---- linux-3.0.8/arch/ia64/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/ia64/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/ia64/mm/fault.c linux-3.1.1/arch/ia64/mm/fault.c
+--- linux-3.1.1/arch/ia64/mm/fault.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/mm/fault.c	2011-11-16 18:39:07.000000000 -0500
 @@ -73,6 +73,23 @@ mapped_kernel_page_is_present (unsigned 
  	return pte_present(pte);
  }
  
 +#ifdef CONFIG_PAX_PAGEEXEC
-+void pax_report_insns(void *pc, void *sp)
++void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
 +{
 +	unsigned long i;
 +
@@ -1023,9 +1023,9 @@
  	/*
  	 * If for any reason at all we couldn't handle the fault, make
  	 * sure we exit gracefully rather than endlessly redo the
-diff -urNp linux-3.0.8/arch/ia64/mm/hugetlbpage.c linux-3.0.8/arch/ia64/mm/hugetlbpage.c
---- linux-3.0.8/arch/ia64/mm/hugetlbpage.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/ia64/mm/hugetlbpage.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/ia64/mm/hugetlbpage.c linux-3.1.1/arch/ia64/mm/hugetlbpage.c
+--- linux-3.1.1/arch/ia64/mm/hugetlbpage.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/mm/hugetlbpage.c	2011-11-16 18:39:07.000000000 -0500
 @@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area(
  		/* At this point:  (!vmm || addr < vmm->vm_end). */
  		if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
@@ -1035,9 +1035,9 @@
  			return addr;
  		addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
  	}
-diff -urNp linux-3.0.8/arch/ia64/mm/init.c linux-3.0.8/arch/ia64/mm/init.c
---- linux-3.0.8/arch/ia64/mm/init.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/ia64/mm/init.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/ia64/mm/init.c linux-3.1.1/arch/ia64/mm/init.c
+--- linux-3.1.1/arch/ia64/mm/init.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/mm/init.c	2011-11-16 18:39:07.000000000 -0500
 @@ -120,6 +120,19 @@ ia64_init_addr_space (void)
  		vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
  		vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1058,9 +1058,9 @@
  		vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
  		down_write(&current->mm->mmap_sem);
  		if (insert_vm_struct(current->mm, vma)) {
-diff -urNp linux-3.0.8/arch/m32r/lib/usercopy.c linux-3.0.8/arch/m32r/lib/usercopy.c
---- linux-3.0.8/arch/m32r/lib/usercopy.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/m32r/lib/usercopy.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/m32r/lib/usercopy.c linux-3.1.1/arch/m32r/lib/usercopy.c
+--- linux-3.1.1/arch/m32r/lib/usercopy.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/m32r/lib/usercopy.c	2011-11-16 18:39:07.000000000 -0500
 @@ -14,6 +14,9 @@
  unsigned long
  __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1081,9 +1081,9 @@
  	prefetchw(to);
  	if (access_ok(VERIFY_READ, from, n))
  		__copy_user_zeroing(to,from,n);
-diff -urNp linux-3.0.8/arch/mips/include/asm/elf.h linux-3.0.8/arch/mips/include/asm/elf.h
---- linux-3.0.8/arch/mips/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/mips/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/mips/include/asm/elf.h linux-3.1.1/arch/mips/include/asm/elf.h
+--- linux-3.1.1/arch/mips/include/asm/elf.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/mips/include/asm/elf.h	2011-11-16 18:39:07.000000000 -0500
 @@ -372,13 +372,16 @@ extern const char *__elf_platform;
  #define ELF_ET_DYN_BASE         (TASK_SIZE / 3 * 2)
  #endif
@@ -1105,9 +1105,9 @@
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif /* _ASM_ELF_H */
-diff -urNp linux-3.0.8/arch/mips/include/asm/page.h linux-3.0.8/arch/mips/include/asm/page.h
---- linux-3.0.8/arch/mips/include/asm/page.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/mips/include/asm/page.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/mips/include/asm/page.h linux-3.1.1/arch/mips/include/asm/page.h
+--- linux-3.1.1/arch/mips/include/asm/page.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/mips/include/asm/page.h	2011-11-16 18:39:07.000000000 -0500
 @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
    #ifdef CONFIG_CPU_MIPS32
      typedef struct { unsigned long pte_low, pte_high; } pte_t;
@@ -1117,9 +1117,9 @@
    #else
       typedef struct { unsigned long long pte; } pte_t;
       #define pte_val(x)	((x).pte)
-diff -urNp linux-3.0.8/arch/mips/include/asm/system.h linux-3.0.8/arch/mips/include/asm/system.h
---- linux-3.0.8/arch/mips/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/mips/include/asm/system.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/mips/include/asm/system.h linux-3.1.1/arch/mips/include/asm/system.h
+--- linux-3.1.1/arch/mips/include/asm/system.h	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/mips/include/asm/system.h	2011-11-16 18:39:07.000000000 -0500
 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
   */
  #define __ARCH_WANT_UNLOCKED_CTXSW
@@ -1128,9 +1128,9 @@
 +#define arch_align_stack(x) ((x) & ~0xfUL)
  
  #endif /* _ASM_SYSTEM_H */
-diff -urNp linux-3.0.8/arch/mips/kernel/binfmt_elfn32.c linux-3.0.8/arch/mips/kernel/binfmt_elfn32.c
---- linux-3.0.8/arch/mips/kernel/binfmt_elfn32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.8/arch/mips/kernel/binfmt_elfn32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/mips/kernel/binfmt_elfn32.c linux-3.1.1/arch/mips/kernel/binfmt_elfn32.c
+--- linux-3.1.1/arch/mips/kernel/binfmt_elfn32.c	2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/mips/kernel/binfmt_elfn32.c	2011-11-16 18:39:07.000000000 -0500
 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  #undef ELF_ET_DYN_BASE
  #define ELF_ET_DYN_BASE         (TASK32_SIZE / 3 * 2)
@@ -1145,9 +1145,9 @@
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_full.patch?r1=1.86&r2=1.87&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.999&r2=1.1000&f=u

More information about the pld-cvs-commit mailing list