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

arekm arekm at pld-linux.org
Mon Jul 5 21:29:49 CEST 2010


Author: arekm                        Date: Mon Jul  5 19:29:49 2010 GMT
Module: packages                      Tag: GRSECURITY_RAW
---- Log message:
http://www.grsecurity.net/~spender/grsecurity-2.2.0-2.6.34-201007031927.patch

---- Files affected:
packages/kernel:
   kernel-grsec_full.patch (1.3.2.36 -> 1.3.2.37) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-grsec_full.patch
diff -u packages/kernel/kernel-grsec_full.patch:1.3.2.36 packages/kernel/kernel-grsec_full.patch:1.3.2.37
--- packages/kernel/kernel-grsec_full.patch:1.3.2.36	Wed Jun  2 21:35:13 2010
+++ packages/kernel/kernel-grsec_full.patch	Mon Jul  5 21:29:31 2010
@@ -1,6 +1,21 @@
-diff -urNp linux-2.6.33.5/arch/alpha/include/asm/elf.h linux-2.6.33.5/arch/alpha/include/asm/elf.h
---- linux-2.6.33.5/arch/alpha/include/asm/elf.h	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/alpha/include/asm/elf.h	2010-05-28 20:26:15.015654855 -0400
+diff -urNp linux-2.6.34/arch/alpha/include/asm/dma-mapping.h linux-2.6.34/arch/alpha/include/asm/dma-mapping.h
+--- linux-2.6.34/arch/alpha/include/asm/dma-mapping.h	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/alpha/include/asm/dma-mapping.h	2010-07-01 20:45:13.000000000 -0400
+@@ -3,9 +3,9 @@
+ 
+ #include <linux/dma-attrs.h>
+ 
+-extern struct dma_map_ops *dma_ops;
++extern const struct dma_map_ops *dma_ops;
+ 
+-static inline struct dma_map_ops *get_dma_ops(struct device *dev)
++static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
+ {
+ 	return dma_ops;
+ }
+diff -urNp linux-2.6.34/arch/alpha/include/asm/elf.h linux-2.6.34/arch/alpha/include/asm/elf.h
+--- linux-2.6.34/arch/alpha/include/asm/elf.h	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/alpha/include/asm/elf.h	2010-07-01 20:45:13.000000000 -0400
 @@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x1000000)
@@ -15,9 +30,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-2.6.33.5/arch/alpha/include/asm/pgtable.h linux-2.6.33.5/arch/alpha/include/asm/pgtable.h
---- linux-2.6.33.5/arch/alpha/include/asm/pgtable.h	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/alpha/include/asm/pgtable.h	2010-05-28 20:26:15.036617310 -0400
+diff -urNp linux-2.6.34/arch/alpha/include/asm/pgtable.h linux-2.6.34/arch/alpha/include/asm/pgtable.h
+--- linux-2.6.34/arch/alpha/include/asm/pgtable.h	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/alpha/include/asm/pgtable.h	2010-07-01 20:45:13.000000000 -0400
 @@ -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,9 +51,9 @@
  #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-2.6.33.5/arch/alpha/kernel/module.c linux-2.6.33.5/arch/alpha/kernel/module.c
---- linux-2.6.33.5/arch/alpha/kernel/module.c	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/alpha/kernel/module.c	2010-05-28 20:26:15.036617310 -0400
+diff -urNp linux-2.6.34/arch/alpha/kernel/module.c linux-2.6.34/arch/alpha/kernel/module.c
+--- linux-2.6.34/arch/alpha/kernel/module.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/alpha/kernel/module.c	2010-07-01 20:45:13.000000000 -0400
 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, 
  
  	/* The small sections were sorted to the end of the segment.
@@ -48,10 +63,10 @@
  	got = sechdrs[me->arch.gotsecindex].sh_addr;
  
  	for (i = 0; i < n; i++) {
-diff -urNp linux-2.6.33.5/arch/alpha/kernel/osf_sys.c linux-2.6.33.5/arch/alpha/kernel/osf_sys.c
---- linux-2.6.33.5/arch/alpha/kernel/osf_sys.c	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/alpha/kernel/osf_sys.c	2010-05-28 20:26:15.036617310 -0400
-@@ -1205,6 +1205,10 @@ arch_get_unmapped_area(struct file *filp
+diff -urNp linux-2.6.34/arch/alpha/kernel/osf_sys.c linux-2.6.34/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.34/arch/alpha/kernel/osf_sys.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/alpha/kernel/osf_sys.c	2010-07-01 20:45:13.000000000 -0400
+@@ -1206,6 +1206,10 @@ arch_get_unmapped_area(struct file *filp
  	   merely specific addresses, but regions of memory -- perhaps
  	   this feature should be incorporated into all ports?  */
  
@@ -62,7 +77,7 @@
  	if (addr) {
  		addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
  		if (addr != (unsigned long) -ENOMEM)
-@@ -1212,8 +1216,8 @@ arch_get_unmapped_area(struct file *filp
+@@ -1213,8 +1217,8 @@ arch_get_unmapped_area(struct file *filp
  	}
  
  	/* Next, try allocating at TASK_UNMAPPED_BASE.  */
@@ -73,9 +88,49 @@
  	if (addr != (unsigned long) -ENOMEM)
  		return addr;
  
-diff -urNp linux-2.6.33.5/arch/alpha/mm/fault.c linux-2.6.33.5/arch/alpha/mm/fault.c
---- linux-2.6.33.5/arch/alpha/mm/fault.c	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/alpha/mm/fault.c	2010-05-28 20:26:15.036617310 -0400
+diff -urNp linux-2.6.34/arch/alpha/kernel/pci_iommu.c linux-2.6.34/arch/alpha/kernel/pci_iommu.c
+--- linux-2.6.34/arch/alpha/kernel/pci_iommu.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/alpha/kernel/pci_iommu.c	2010-07-01 20:45:13.000000000 -0400
+@@ -950,7 +950,7 @@ static int alpha_pci_set_mask(struct dev
+ 	return 0;
+ }
+ 
+-struct dma_map_ops alpha_pci_ops = {
++const struct dma_map_ops alpha_pci_ops = {
+ 	.alloc_coherent		= alpha_pci_alloc_coherent,
+ 	.free_coherent		= alpha_pci_free_coherent,
+ 	.map_page		= alpha_pci_map_page,
+@@ -962,5 +962,5 @@ struct dma_map_ops alpha_pci_ops = {
+ 	.set_dma_mask		= alpha_pci_set_mask,
+ };
+ 
+-struct dma_map_ops *dma_ops = &alpha_pci_ops;
++const struct dma_map_ops *dma_ops = &alpha_pci_ops;
+ EXPORT_SYMBOL(dma_ops);
+diff -urNp linux-2.6.34/arch/alpha/kernel/pci-noop.c linux-2.6.34/arch/alpha/kernel/pci-noop.c
+--- linux-2.6.34/arch/alpha/kernel/pci-noop.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/alpha/kernel/pci-noop.c	2010-07-01 20:45:13.000000000 -0400
+@@ -173,7 +173,7 @@ static int alpha_noop_set_mask(struct de
+ 	return 0;
+ }
+ 
+-struct dma_map_ops alpha_noop_ops = {
++const struct dma_map_ops alpha_noop_ops = {
+ 	.alloc_coherent		= alpha_noop_alloc_coherent,
+ 	.free_coherent		= alpha_noop_free_coherent,
+ 	.map_page		= alpha_noop_map_page,
+@@ -183,7 +183,7 @@ struct dma_map_ops alpha_noop_ops = {
+ 	.set_dma_mask		= alpha_noop_set_mask,
+ };
+ 
+-struct dma_map_ops *dma_ops = &alpha_noop_ops;
++const struct dma_map_ops *dma_ops = &alpha_noop_ops;
+ EXPORT_SYMBOL(dma_ops);
+ 
+ void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
+diff -urNp linux-2.6.34/arch/alpha/mm/fault.c linux-2.6.34/arch/alpha/mm/fault.c
+--- linux-2.6.34/arch/alpha/mm/fault.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/alpha/mm/fault.c	2010-07-01 20:45:13.000000000 -0400
 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
  	__reload_thread(pcb);
  }
@@ -232,10 +287,10 @@
  	} else if (!cause) {
  		/* Allow reads even for write-only mappings */
  		if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-2.6.33.5/arch/arm/include/asm/elf.h linux-2.6.33.5/arch/arm/include/asm/elf.h
---- linux-2.6.33.5/arch/arm/include/asm/elf.h	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/arm/include/asm/elf.h	2010-05-28 20:26:15.036617310 -0400
-@@ -108,7 +108,14 @@ int dump_task_regs(struct task_struct *t
+diff -urNp linux-2.6.34/arch/arm/include/asm/elf.h linux-2.6.34/arch/arm/include/asm/elf.h
+--- linux-2.6.34/arch/arm/include/asm/elf.h	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/include/asm/elf.h	2010-07-01 20:45:13.000000000 -0400
+@@ -111,7 +111,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.  */
  
@@ -251,20 +306,20 @@
  
  /* When the program starts, a1 contains a pointer to a function to be 
     registered with atexit, as per the SVR4 ABI.  A value of 0 means we 
-diff -urNp linux-2.6.33.5/arch/arm/include/asm/kmap_types.h linux-2.6.33.5/arch/arm/include/asm/kmap_types.h
---- linux-2.6.33.5/arch/arm/include/asm/kmap_types.h	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/arm/include/asm/kmap_types.h	2010-05-28 20:26:15.036617310 -0400
-@@ -19,6 +19,7 @@ enum km_type {
- 	KM_SOFTIRQ0,
+diff -urNp linux-2.6.34/arch/arm/include/asm/kmap_types.h linux-2.6.34/arch/arm/include/asm/kmap_types.h
+--- linux-2.6.34/arch/arm/include/asm/kmap_types.h	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/include/asm/kmap_types.h	2010-07-01 20:45:13.000000000 -0400
+@@ -20,6 +20,7 @@ enum km_type {
  	KM_SOFTIRQ1,
+ 	KM_L1_CACHE,
  	KM_L2_CACHE,
 +	KM_CLEARPAGE,
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.33.5/arch/arm/include/asm/uaccess.h linux-2.6.33.5/arch/arm/include/asm/uaccess.h
---- linux-2.6.33.5/arch/arm/include/asm/uaccess.h	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/arm/include/asm/uaccess.h	2010-05-28 20:26:15.038998114 -0400
+diff -urNp linux-2.6.34/arch/arm/include/asm/uaccess.h linux-2.6.34/arch/arm/include/asm/uaccess.h
+--- linux-2.6.34/arch/arm/include/asm/uaccess.h	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/include/asm/uaccess.h	2010-07-01 20:45:13.000000000 -0400
 @@ -403,6 +403,9 @@ extern unsigned long __must_check __strn
  
  static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
@@ -285,10 +340,10 @@
  	if (access_ok(VERIFY_WRITE, to, n))
  		n = __copy_to_user(to, from, n);
  	return n;
-diff -urNp linux-2.6.33.5/arch/arm/kernel/kgdb.c linux-2.6.33.5/arch/arm/kernel/kgdb.c
---- linux-2.6.33.5/arch/arm/kernel/kgdb.c	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/arm/kernel/kgdb.c	2010-05-28 20:26:15.038998114 -0400
-@@ -190,7 +190,7 @@ void kgdb_arch_exit(void)
+diff -urNp linux-2.6.34/arch/arm/kernel/kgdb.c linux-2.6.34/arch/arm/kernel/kgdb.c
+--- linux-2.6.34/arch/arm/kernel/kgdb.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/kernel/kgdb.c	2010-07-01 20:45:13.000000000 -0400
+@@ -203,7 +203,7 @@ void kgdb_arch_exit(void)
   * and we handle the normal undef case within the do_undefinstr
   * handler.
   */
@@ -297,9 +352,9 @@
  #ifndef __ARMEB__
  	.gdb_bpt_instr		= {0xfe, 0xde, 0xff, 0xe7}
  #else /* ! __ARMEB__ */
-diff -urNp linux-2.6.33.5/arch/arm/mach-at91/pm.c linux-2.6.33.5/arch/arm/mach-at91/pm.c
---- linux-2.6.33.5/arch/arm/mach-at91/pm.c	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/arm/mach-at91/pm.c	2010-05-28 20:26:15.038998114 -0400
+diff -urNp linux-2.6.34/arch/arm/mach-at91/pm.c linux-2.6.34/arch/arm/mach-at91/pm.c
+--- linux-2.6.34/arch/arm/mach-at91/pm.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/mach-at91/pm.c	2010-07-01 20:45:13.000000000 -0400
 @@ -294,7 +294,7 @@ static void at91_pm_end(void)
  }
  
@@ -309,9 +364,21 @@
  	.valid	= at91_pm_valid_state,
  	.begin	= at91_pm_begin,
  	.enter	= at91_pm_enter,
-diff -urNp linux-2.6.33.5/arch/arm/mach-omap1/pm.c linux-2.6.33.5/arch/arm/mach-omap1/pm.c
---- linux-2.6.33.5/arch/arm/mach-omap1/pm.c	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/arm/mach-omap1/pm.c	2010-05-28 20:26:15.038998114 -0400
+diff -urNp linux-2.6.34/arch/arm/mach-davinci/pm.c linux-2.6.34/arch/arm/mach-davinci/pm.c
+--- linux-2.6.34/arch/arm/mach-davinci/pm.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/mach-davinci/pm.c	2010-07-01 20:45:13.000000000 -0400
+@@ -110,7 +110,7 @@ static int davinci_pm_enter(suspend_stat
+ 	return ret;
+ }
+ 
+-static struct platform_suspend_ops davinci_pm_ops = {
++static const struct platform_suspend_ops davinci_pm_ops = {
+ 	.enter		= davinci_pm_enter,
+ 	.valid		= suspend_valid_only_mem,
+ };
+diff -urNp linux-2.6.34/arch/arm/mach-omap1/pm.c linux-2.6.34/arch/arm/mach-omap1/pm.c
+--- linux-2.6.34/arch/arm/mach-omap1/pm.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/mach-omap1/pm.c	2010-07-01 20:45:13.000000000 -0400
 @@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq 
  
  
@@ -321,10 +388,10 @@
  	.prepare	= omap_pm_prepare,
  	.enter		= omap_pm_enter,
  	.finish		= omap_pm_finish,
-diff -urNp linux-2.6.33.5/arch/arm/mach-omap2/pm24xx.c linux-2.6.33.5/arch/arm/mach-omap2/pm24xx.c
---- linux-2.6.33.5/arch/arm/mach-omap2/pm24xx.c	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/arm/mach-omap2/pm24xx.c	2010-05-28 20:26:15.038998114 -0400
-@@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
+diff -urNp linux-2.6.34/arch/arm/mach-omap2/pm24xx.c linux-2.6.34/arch/arm/mach-omap2/pm24xx.c
+--- linux-2.6.34/arch/arm/mach-omap2/pm24xx.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/mach-omap2/pm24xx.c	2010-07-01 20:45:13.000000000 -0400
+@@ -324,7 +324,7 @@ static void omap2_pm_finish(void)
  	enable_hlt();
  }
  
@@ -333,10 +400,10 @@
  	.prepare	= omap2_pm_prepare,
  	.enter		= omap2_pm_enter,
  	.finish		= omap2_pm_finish,
-diff -urNp linux-2.6.33.5/arch/arm/mach-omap2/pm34xx.c linux-2.6.33.5/arch/arm/mach-omap2/pm34xx.c
---- linux-2.6.33.5/arch/arm/mach-omap2/pm34xx.c	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/arm/mach-omap2/pm34xx.c	2010-05-28 20:26:15.038998114 -0400
-@@ -650,7 +650,7 @@ static void omap3_pm_end(void)
+diff -urNp linux-2.6.34/arch/arm/mach-omap2/pm34xx.c linux-2.6.34/arch/arm/mach-omap2/pm34xx.c
+--- linux-2.6.34/arch/arm/mach-omap2/pm34xx.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/mach-omap2/pm34xx.c	2010-07-01 20:45:13.000000000 -0400
+@@ -651,7 +651,7 @@ static void omap3_pm_end(void)
  	return;
  }
  
@@ -345,10 +412,10 @@
  	.begin		= omap3_pm_begin,
  	.end		= omap3_pm_end,
  	.prepare	= omap3_pm_prepare,
-diff -urNp linux-2.6.33.5/arch/arm/mach-pnx4008/pm.c linux-2.6.33.5/arch/arm/mach-pnx4008/pm.c
---- linux-2.6.33.5/arch/arm/mach-pnx4008/pm.c	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/arm/mach-pnx4008/pm.c	2010-05-28 20:26:15.038998114 -0400
-@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat
+diff -urNp linux-2.6.34/arch/arm/mach-pnx4008/pm.c linux-2.6.34/arch/arm/mach-pnx4008/pm.c
+--- linux-2.6.34/arch/arm/mach-pnx4008/pm.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/mach-pnx4008/pm.c	2010-07-01 20:45:13.000000000 -0400
+@@ -119,7 +119,7 @@ static int pnx4008_pm_valid(suspend_stat
  	       (state == PM_SUSPEND_MEM);
  }
  
@@ -357,10 +424,10 @@
  	.enter = pnx4008_pm_enter,
  	.valid = pnx4008_pm_valid,
  };
-diff -urNp linux-2.6.33.5/arch/arm/mach-pxa/pm.c linux-2.6.33.5/arch/arm/mach-pxa/pm.c
---- linux-2.6.33.5/arch/arm/mach-pxa/pm.c	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/arm/mach-pxa/pm.c	2010-05-28 20:26:15.038998114 -0400
-@@ -95,7 +95,7 @@ void pxa_pm_finish(void)
+diff -urNp linux-2.6.34/arch/arm/mach-pxa/pm.c linux-2.6.34/arch/arm/mach-pxa/pm.c
+--- linux-2.6.34/arch/arm/mach-pxa/pm.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/mach-pxa/pm.c	2010-07-01 20:45:13.000000000 -0400
+@@ -96,7 +96,7 @@ void pxa_pm_finish(void)
  		pxa_cpu_pm_fns->finish();
  }
  
@@ -369,9 +436,9 @@
  	.valid		= pxa_pm_valid,
  	.enter		= pxa_pm_enter,
  	.prepare	= pxa_pm_prepare,
-diff -urNp linux-2.6.33.5/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.33.5/arch/arm/mach-pxa/sharpsl_pm.c
---- linux-2.6.33.5/arch/arm/mach-pxa/sharpsl_pm.c	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/arm/mach-pxa/sharpsl_pm.c	2010-05-28 20:26:15.048618574 -0400
+diff -urNp linux-2.6.34/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.34/arch/arm/mach-pxa/sharpsl_pm.c
+--- linux-2.6.34/arch/arm/mach-pxa/sharpsl_pm.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/mach-pxa/sharpsl_pm.c	2010-07-01 20:45:13.000000000 -0400
 @@ -892,7 +892,7 @@ static void sharpsl_apm_get_power_status
  }
  
@@ -381,9 +448,9 @@
  	.prepare	= pxa_pm_prepare,
  	.finish		= pxa_pm_finish,
  	.enter		= corgi_pxa_pm_enter,
-diff -urNp linux-2.6.33.5/arch/arm/mach-sa1100/pm.c linux-2.6.33.5/arch/arm/mach-sa1100/pm.c
---- linux-2.6.33.5/arch/arm/mach-sa1100/pm.c	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/arm/mach-sa1100/pm.c	2010-05-28 20:26:15.048618574 -0400
+diff -urNp linux-2.6.34/arch/arm/mach-sa1100/pm.c linux-2.6.34/arch/arm/mach-sa1100/pm.c
+--- linux-2.6.34/arch/arm/mach-sa1100/pm.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/mach-sa1100/pm.c	2010-07-01 20:45:13.000000000 -0400
 @@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
  	return virt_to_phys(sp);
  }
@@ -393,10 +460,10 @@
  	.enter		= sa11x0_pm_enter,
  	.valid		= suspend_valid_only_mem,
  };
-diff -urNp linux-2.6.33.5/arch/arm/mm/fault.c linux-2.6.33.5/arch/arm/mm/fault.c
---- linux-2.6.33.5/arch/arm/mm/fault.c	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/arm/mm/fault.c	2010-05-28 20:26:15.048618574 -0400
-@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk,
+diff -urNp linux-2.6.34/arch/arm/mm/fault.c linux-2.6.34/arch/arm/mm/fault.c
+--- linux-2.6.34/arch/arm/mm/fault.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/mm/fault.c	2010-07-01 20:45:13.000000000 -0400
+@@ -167,6 +167,13 @@ __do_user_fault(struct task_struct *tsk,
  	}
  #endif
  
@@ -410,7 +477,7 @@
  	tsk->thread.address = addr;
  	tsk->thread.error_code = fsr;
  	tsk->thread.trap_no = 14;
-@@ -357,6 +364,33 @@ do_page_fault(unsigned long addr, unsign
+@@ -364,6 +371,33 @@ do_page_fault(unsigned long addr, unsign
  }
  #endif					/* CONFIG_MMU */
  
@@ -444,9 +511,9 @@
  /*
   * First Level Translation Fault Handler
   *
-diff -urNp linux-2.6.33.5/arch/arm/mm/mmap.c linux-2.6.33.5/arch/arm/mm/mmap.c
---- linux-2.6.33.5/arch/arm/mm/mmap.c	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/arm/mm/mmap.c	2010-05-28 20:26:15.048618574 -0400
+diff -urNp linux-2.6.34/arch/arm/mm/mmap.c linux-2.6.34/arch/arm/mm/mmap.c
+--- linux-2.6.34/arch/arm/mm/mmap.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/mm/mmap.c	2010-07-01 20:45:13.000000000 -0400
 @@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
  	if (len > TASK_SIZE)
  		return -ENOMEM;
@@ -483,9 +550,9 @@
  				mm->cached_hole_size = 0;
  				goto full_search;
  			}
-diff -urNp linux-2.6.33.5/arch/arm/plat-s3c/pm.c linux-2.6.33.5/arch/arm/plat-s3c/pm.c
---- linux-2.6.33.5/arch/arm/plat-s3c/pm.c	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/arm/plat-s3c/pm.c	2010-05-28 20:26:15.063131407 -0400
+diff -urNp linux-2.6.34/arch/arm/plat-samsung/pm.c linux-2.6.34/arch/arm/plat-samsung/pm.c
+--- linux-2.6.34/arch/arm/plat-samsung/pm.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/plat-samsung/pm.c	2010-07-01 20:45:13.000000000 -0400
 @@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
  	s3c_pm_check_cleanup();
  }
@@ -495,9 +562,9 @@
  	.enter		= s3c_pm_enter,
  	.prepare	= s3c_pm_prepare,
  	.finish		= s3c_pm_finish,
-diff -urNp linux-2.6.33.5/arch/avr32/include/asm/elf.h linux-2.6.33.5/arch/avr32/include/asm/elf.h
---- linux-2.6.33.5/arch/avr32/include/asm/elf.h	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/avr32/include/asm/elf.h	2010-05-28 20:26:15.063131407 -0400
+diff -urNp linux-2.6.34/arch/avr32/include/asm/elf.h linux-2.6.34/arch/avr32/include/asm/elf.h
+--- linux-2.6.34/arch/avr32/include/asm/elf.h	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/avr32/include/asm/elf.h	2010-07-01 20:45:13.000000000 -0400
 @@ -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.  */
@@ -514,9 +581,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-2.6.33.5/arch/avr32/include/asm/kmap_types.h linux-2.6.33.5/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.33.5/arch/avr32/include/asm/kmap_types.h	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/avr32/include/asm/kmap_types.h	2010-05-28 20:26:15.063131407 -0400
+diff -urNp linux-2.6.34/arch/avr32/include/asm/kmap_types.h linux-2.6.34/arch/avr32/include/asm/kmap_types.h
+--- linux-2.6.34/arch/avr32/include/asm/kmap_types.h	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/avr32/include/asm/kmap_types.h	2010-07-01 20:45:13.000000000 -0400
 @@ -22,7 +22,8 @@ D(10)	KM_IRQ0,
  D(11)	KM_IRQ1,
  D(12)	KM_SOFTIRQ0,
@@ -527,9 +594,9 @@
  };
  
  #undef D
-diff -urNp linux-2.6.33.5/arch/avr32/mach-at32ap/pm.c linux-2.6.33.5/arch/avr32/mach-at32ap/pm.c
---- linux-2.6.33.5/arch/avr32/mach-at32ap/pm.c	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/avr32/mach-at32ap/pm.c	2010-05-28 20:26:15.063131407 -0400
+diff -urNp linux-2.6.34/arch/avr32/mach-at32ap/pm.c linux-2.6.34/arch/avr32/mach-at32ap/pm.c
+--- linux-2.6.34/arch/avr32/mach-at32ap/pm.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/avr32/mach-at32ap/pm.c	2010-07-01 20:45:13.000000000 -0400
 @@ -176,7 +176,7 @@ out:
  	return 0;
  }
@@ -539,9 +606,9 @@
  	.valid	= avr32_pm_valid_state,
  	.enter	= avr32_pm_enter,
  };
-diff -urNp linux-2.6.33.5/arch/avr32/mm/fault.c linux-2.6.33.5/arch/avr32/mm/fault.c
---- linux-2.6.33.5/arch/avr32/mm/fault.c	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/avr32/mm/fault.c	2010-05-28 20:26:15.071147063 -0400
+diff -urNp linux-2.6.34/arch/avr32/mm/fault.c linux-2.6.34/arch/avr32/mm/fault.c
+--- linux-2.6.34/arch/avr32/mm/fault.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/avr32/mm/fault.c	2010-07-01 20:45:13.000000000 -0400
 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
  
  int exception_trace = 1;
@@ -583,9 +650,9 @@
  		if (exception_trace && printk_ratelimit())
  			printk("%s%s[%d]: segfault at %08lx pc %08lx "
  			       "sp %08lx ecr %lu\n",
-diff -urNp linux-2.6.33.5/arch/blackfin/kernel/kgdb.c linux-2.6.33.5/arch/blackfin/kernel/kgdb.c
---- linux-2.6.33.5/arch/blackfin/kernel/kgdb.c	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/blackfin/kernel/kgdb.c	2010-05-28 20:26:15.079114473 -0400
+diff -urNp linux-2.6.34/arch/blackfin/kernel/kgdb.c linux-2.6.34/arch/blackfin/kernel/kgdb.c
+--- linux-2.6.34/arch/blackfin/kernel/kgdb.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/blackfin/kernel/kgdb.c	2010-07-01 20:45:13.000000000 -0400
 @@ -397,7 +397,7 @@ int kgdb_arch_handle_exception(int vecto
  	return -1;		/* this means that we do not want to exit from the handler */
  }
@@ -595,10 +662,10 @@
  	.gdb_bpt_instr = {0xa1},
  #ifdef CONFIG_SMP
  	.flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
-diff -urNp linux-2.6.33.5/arch/blackfin/mach-common/pm.c linux-2.6.33.5/arch/blackfin/mach-common/pm.c
---- linux-2.6.33.5/arch/blackfin/mach-common/pm.c	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/blackfin/mach-common/pm.c	2010-05-28 20:26:15.079114473 -0400
-@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t
+diff -urNp linux-2.6.34/arch/blackfin/mach-common/pm.c linux-2.6.34/arch/blackfin/mach-common/pm.c
+--- linux-2.6.34/arch/blackfin/mach-common/pm.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/blackfin/mach-common/pm.c	2010-07-01 20:45:13.000000000 -0400
+@@ -256,7 +256,7 @@ static int bfin_pm_enter(suspend_state_t
  	return 0;
  }
  
@@ -607,9 +674,9 @@
  	.enter = bfin_pm_enter,
  	.valid	= bfin_pm_valid,
  };
-diff -urNp linux-2.6.33.5/arch/blackfin/mm/maccess.c linux-2.6.33.5/arch/blackfin/mm/maccess.c
---- linux-2.6.33.5/arch/blackfin/mm/maccess.c	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/blackfin/mm/maccess.c	2010-05-28 20:26:15.082982115 -0400
+diff -urNp linux-2.6.34/arch/blackfin/mm/maccess.c linux-2.6.34/arch/blackfin/mm/maccess.c
+--- linux-2.6.34/arch/blackfin/mm/maccess.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/blackfin/mm/maccess.c	2010-07-01 20:45:13.000000000 -0400
 @@ -16,7 +16,7 @@ static int validate_memory_access_addres
  	return bfin_mem_access_type(addr, size);
  }
@@ -628,9 +695,9 @@
  {
  	unsigned long ldst = (unsigned long)dst;
  	int mem_type;
-diff -urNp linux-2.6.33.5/arch/frv/include/asm/kmap_types.h linux-2.6.33.5/arch/frv/include/asm/kmap_types.h
---- linux-2.6.33.5/arch/frv/include/asm/kmap_types.h	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/frv/include/asm/kmap_types.h	2010-05-28 20:26:15.082982115 -0400
+diff -urNp linux-2.6.34/arch/frv/include/asm/kmap_types.h linux-2.6.34/arch/frv/include/asm/kmap_types.h
+--- linux-2.6.34/arch/frv/include/asm/kmap_types.h	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/frv/include/asm/kmap_types.h	2010-07-01 20:45:13.000000000 -0400
 @@ -23,6 +23,7 @@ enum km_type {
  	KM_IRQ1,
  	KM_SOFTIRQ0,
@@ -639,9 +706,9 @@
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.33.5/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.33.5/arch/ia64/hp/common/hwsw_iommu.c
---- linux-2.6.33.5/arch/ia64/hp/common/hwsw_iommu.c	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/ia64/hp/common/hwsw_iommu.c	2010-05-28 20:26:15.082982115 -0400
+diff -urNp linux-2.6.34/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.34/arch/ia64/hp/common/hwsw_iommu.c
+--- linux-2.6.34/arch/ia64/hp/common/hwsw_iommu.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/ia64/hp/common/hwsw_iommu.c	2010-07-01 20:45:13.000000000 -0400
 @@ -17,7 +17,7 @@
  #include <linux/swiotlb.h>
  #include <asm/machvec.h>
@@ -660,9 +727,9 @@
  {
  	if (use_swiotlb(dev))
  		return &swiotlb_dma_ops;
-diff -urNp linux-2.6.33.5/arch/ia64/hp/common/sba_iommu.c linux-2.6.33.5/arch/ia64/hp/common/sba_iommu.c
---- linux-2.6.33.5/arch/ia64/hp/common/sba_iommu.c	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/ia64/hp/common/sba_iommu.c	2010-05-28 20:26:15.082982115 -0400
+diff -urNp linux-2.6.34/arch/ia64/hp/common/sba_iommu.c linux-2.6.34/arch/ia64/hp/common/sba_iommu.c
+--- linux-2.6.34/arch/ia64/hp/common/sba_iommu.c	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/ia64/hp/common/sba_iommu.c	2010-07-01 20:45:13.000000000 -0400
 @@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d
  	},
  };
@@ -681,45 +748,9 @@
  	.alloc_coherent		= sba_alloc_coherent,
  	.free_coherent		= sba_free_coherent,
  	.map_page		= sba_map_page,
-diff -urNp linux-2.6.33.5/arch/ia64/ia32/binfmt_elf32.c linux-2.6.33.5/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.33.5/arch/ia64/ia32/binfmt_elf32.c	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/ia64/ia32/binfmt_elf32.c	2010-05-28 20:26:15.082982115 -0400
-@@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_
- 
- #define elf_read_implies_exec(ex, have_pt_gnu_stack)	(!(have_pt_gnu_stack))
- 
-+#ifdef CONFIG_PAX_ASLR
-+#define PAX_ELF_ET_DYN_BASE	(current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
-+
-+#define PAX_DELTA_MMAP_LEN	(current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
-+#define PAX_DELTA_STACK_LEN	(current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
-+#endif
-+
- /* Ugly but avoids duplication */
- #include "../../../fs/binfmt_elf.c"
- 
-diff -urNp linux-2.6.33.5/arch/ia64/ia32/ia32priv.h linux-2.6.33.5/arch/ia64/ia32/ia32priv.h
---- linux-2.6.33.5/arch/ia64/ia32/ia32priv.h	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/ia64/ia32/ia32priv.h	2010-05-28 20:26:15.082982115 -0400
-@@ -296,7 +296,14 @@ typedef struct compat_siginfo {
- #define ELF_DATA	ELFDATA2LSB
- #define ELF_ARCH	EM_386
- 
--#define IA32_STACK_TOP		IA32_PAGE_OFFSET
-+#ifdef CONFIG_PAX_RANDUSTACK
-+#define __IA32_DELTA_STACK	(current->mm->delta_stack)
-+#else
-+#define __IA32_DELTA_STACK	0UL
-+#endif
-+
-+#define IA32_STACK_TOP		(IA32_PAGE_OFFSET - __IA32_DELTA_STACK)
-+
- #define IA32_GATE_OFFSET	IA32_PAGE_OFFSET
- #define IA32_GATE_END		IA32_PAGE_OFFSET + PAGE_SIZE
- 
-diff -urNp linux-2.6.33.5/arch/ia64/include/asm/dma-mapping.h linux-2.6.33.5/arch/ia64/include/asm/dma-mapping.h
---- linux-2.6.33.5/arch/ia64/include/asm/dma-mapping.h	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/ia64/include/asm/dma-mapping.h	2010-05-28 20:26:15.082982115 -0400
+diff -urNp linux-2.6.34/arch/ia64/include/asm/dma-mapping.h linux-2.6.34/arch/ia64/include/asm/dma-mapping.h
+--- linux-2.6.34/arch/ia64/include/asm/dma-mapping.h	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/ia64/include/asm/dma-mapping.h	2010-07-01 20:45:13.000000000 -0400
 @@ -12,7 +12,7 @@
  
  #define ARCH_HAS_DMA_GET_REQUIRED_MASK
@@ -763,9 +794,9 @@
  	return ops->dma_supported(dev, mask);
  }
  
-diff -urNp linux-2.6.33.5/arch/ia64/include/asm/elf.h linux-2.6.33.5/arch/ia64/include/asm/elf.h
---- linux-2.6.33.5/arch/ia64/include/asm/elf.h	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/ia64/include/asm/elf.h	2010-05-28 20:26:15.082982115 -0400
+diff -urNp linux-2.6.34/arch/ia64/include/asm/elf.h linux-2.6.34/arch/ia64/include/asm/elf.h
+--- linux-2.6.34/arch/ia64/include/asm/elf.h	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/ia64/include/asm/elf.h	2010-07-01 20:45:13.000000000 -0400
 @@ -42,6 +42,13 @@
   */
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -780,9 +811,9 @@
  #define PT_IA_64_UNWIND		0x70000001
  
  /* IA-64 relocations: */
-diff -urNp linux-2.6.33.5/arch/ia64/include/asm/machvec.h linux-2.6.33.5/arch/ia64/include/asm/machvec.h
---- linux-2.6.33.5/arch/ia64/include/asm/machvec.h	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/ia64/include/asm/machvec.h	2010-05-28 20:26:15.082982115 -0400
+diff -urNp linux-2.6.34/arch/ia64/include/asm/machvec.h linux-2.6.34/arch/ia64/include/asm/machvec.h
+--- linux-2.6.34/arch/ia64/include/asm/machvec.h	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/ia64/include/asm/machvec.h	2010-07-01 20:45:13.000000000 -0400
 @@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
  /* DMA-mapping interface: */
  typedef void ia64_mv_dma_init (void);
@@ -801,9 +832,9 @@
  
  /*
   * Define default versions so we can extend machvec for new platforms without having
-diff -urNp linux-2.6.33.5/arch/ia64/include/asm/pgtable.h linux-2.6.33.5/arch/ia64/include/asm/pgtable.h
---- linux-2.6.33.5/arch/ia64/include/asm/pgtable.h	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/ia64/include/asm/pgtable.h	2010-05-28 20:26:15.082982115 -0400
+diff -urNp linux-2.6.34/arch/ia64/include/asm/pgtable.h linux-2.6.34/arch/ia64/include/asm/pgtable.h
+--- linux-2.6.34/arch/ia64/include/asm/pgtable.h	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/ia64/include/asm/pgtable.h	2010-07-01 20:45:13.000000000 -0400
 @@ -143,6 +143,17 @@
  #define PAGE_READONLY	__pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
  #define PAGE_COPY	__pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
@@ -822,9 +853,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-2.6.33.5/arch/ia64/include/asm/uaccess.h linux-2.6.33.5/arch/ia64/include/asm/uaccess.h
---- linux-2.6.33.5/arch/ia64/include/asm/uaccess.h	2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.5/arch/ia64/include/asm/uaccess.h	2010-05-28 20:26:15.082982115 -0400
+diff -urNp linux-2.6.34/arch/ia64/include/asm/uaccess.h linux-2.6.34/arch/ia64/include/asm/uaccess.h
+--- linux-2.6.34/arch/ia64/include/asm/uaccess.h	2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/ia64/include/asm/uaccess.h	2010-07-01 20:45:13.000000000 -0400
 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
<<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.3.2.36&r2=1.3.2.37&f=u



More information about the pld-cvs-commit mailing list