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

arekm arekm at pld-linux.org
Sat Dec 5 20:06:39 CET 2009


Author: arekm                        Date: Sat Dec  5 19:06:39 2009 GMT
Module: packages                      Tag: GRSECURITY_RAW
---- Log message:
http://www.grsecurity.net/~spender/grsecurity-2.1.14-2.6.31.6-200912042121.patch

---- Files affected:
packages/kernel:
   kernel-grsec_full.patch (1.3.2.20 -> 1.3.2.21) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-grsec_full.patch
diff -u packages/kernel/kernel-grsec_full.patch:1.3.2.20 packages/kernel/kernel-grsec_full.patch:1.3.2.21
--- packages/kernel/kernel-grsec_full.patch:1.3.2.20	Tue Nov 17 11:52:28 2009
+++ packages/kernel/kernel-grsec_full.patch	Sat Dec  5 20:06:27 2009
@@ -1,6 +1,144 @@
+diff -urNp linux-2.6.31.6/Documentation/dontdiff linux-2.6.31.6/Documentation/dontdiff
+--- linux-2.6.31.6/Documentation/dontdiff	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/Documentation/dontdiff	2009-12-04 09:42:35.000000000 -0500
+@@ -3,6 +3,7 @@
+ *.bin
+ *.cpio
+ *.csp
++*.dbg
+ *.dsp
+ *.dvi
+ *.elf
+@@ -49,11 +50,16 @@
+ 53c700_d.h
+ CVS
+ ChangeSet
++GPATH
++GRTAGS
++GSYMS
++GTAGS
+ Image
+ Kerntypes
+ Module.markers
+ Module.symvers
+ PENDING
++PERF*
+ SCCS
+ System.map*
+ TAGS
+@@ -76,7 +82,9 @@ btfixupprep
+ build
+ bvmlinux
+ bzImage*
++capflags.c
+ classlist.h*
++common-cmds.h
+ comp*.log
+ compile.h*
+ conf
+@@ -103,13 +111,14 @@ gen_crc32table
+ gen_init_cpio
+ genksyms
+ *_gray256.c
++hash
+ ihex2fw
+ ikconfig.h*
+ initramfs_data.cpio
++initramfs_data.cpio.bz2
+ initramfs_data.cpio.gz
+ initramfs_list
+ kallsyms
+-kconfig
+ keywords.c
+ ksym.c*
+ ksym.h*
+@@ -133,6 +142,7 @@ mkboot
+ mkbugboot
+ mkcpustr
+ mkdep
++mkpiggy
+ mkprep
+ mktables
+ mktree
+@@ -149,6 +159,7 @@ patches*
+ pca200e.bin
+ pca200e_ecd.bin2
+ piggy.gz
++piggy.S
+ piggyback
+ pnmtologo
+ ppc_defs.h*
+@@ -163,6 +174,7 @@ setup
+ setup.bin
+ setup.elf
+ sImage
++slabinfo
+ sm_tbl*
+ split-include
+ syscalltab.h
+@@ -186,14 +198,20 @@ version.h*
+ vmlinux
+ vmlinux-*
+ vmlinux.aout
++vmlinux.bin.all
++vmlinux.bin.bz2
+ vmlinux.lds
++vmlinux.relocs
++voffset.h
+ vsyscall.lds
+ vsyscall_32.lds
+ wanxlfw.inc
+ uImage
+ unifdef
++utsrelease.h
+ wakeup.bin
+ wakeup.elf
+ wakeup.lds
+ zImage*
+ zconf.hash.c
++zoffset.h
+diff -urNp linux-2.6.31.6/Documentation/kernel-parameters.txt linux-2.6.31.6/Documentation/kernel-parameters.txt
+--- linux-2.6.31.6/Documentation/kernel-parameters.txt	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/Documentation/kernel-parameters.txt	2009-12-04 09:42:35.000000000 -0500
+@@ -1776,6 +1776,12 @@ and is between 256 and 4096 characters. 
+ 			the specified number of seconds.  This is to be used if
+ 			your oopses keep scrolling off the screen.
+ 
++	pax_nouderef	[X86-32] disables UDEREF.  Most likely needed under certain
++			virtualization environments that don't cope well with the
++			expand down segment used by UDEREF on X86-32.
++
++	pax_softmode=	[X86-32] 0/1 to disable/enable PaX softmode on boot already.
++
+ 	pcbit=		[HW,ISDN]
+ 
+ 	pcd.		[PARIDE]
+diff -urNp linux-2.6.31.6/Makefile linux-2.6.31.6/Makefile
+--- linux-2.6.31.6/Makefile	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/Makefile	2009-12-04 09:42:36.000000000 -0500
+@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
+ 
+ HOSTCC       = gcc
+ HOSTCXX      = g++
+-HOSTCFLAGS   = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
+-HOSTCXXFLAGS = -O2
++HOSTCFLAGS   = -Wall -W -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
++HOSTCXXFLAGS = -O2 -fno-delete-null-pointer-checks
+ 
+ # Decide whether to build built-in, modular, or both.
+ # Normally, just do built-in.
+@@ -639,7 +639,7 @@ export mod_strip_cmd
+ 
+ 
+ ifeq ($(KBUILD_EXTMOD),)
+-core-y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/
++core-y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
+ 
+ vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
+ 		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
 diff -urNp linux-2.6.31.6/arch/alpha/include/asm/atomic.h linux-2.6.31.6/arch/alpha/include/asm/atomic.h
---- linux-2.6.31.6/arch/alpha/include/asm/atomic.h	2009-11-10 18:45:29.000000000 -0500
-+++ linux-2.6.31.6/arch/alpha/include/asm/atomic.h	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/alpha/include/asm/atomic.h	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/alpha/include/asm/atomic.h	2009-12-04 09:42:35.000000000 -0500
 @@ -18,9 +18,11 @@
  #define ATOMIC64_INIT(i)	( (atomic64_t) { (i) } )
  
@@ -46,8 +184,8 @@
  
  #define atomic_dec(v) atomic_sub(1,(v))
 diff -urNp linux-2.6.31.6/arch/alpha/include/asm/elf.h linux-2.6.31.6/arch/alpha/include/asm/elf.h
---- linux-2.6.31.6/arch/alpha/include/asm/elf.h	2009-11-10 18:45:29.000000000 -0500
-+++ linux-2.6.31.6/arch/alpha/include/asm/elf.h	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/alpha/include/asm/elf.h	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/alpha/include/asm/elf.h	2009-12-04 09:42:35.000000000 -0500
 @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x1000000)
@@ -63,8 +201,8 @@
     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.31.6/arch/alpha/include/asm/pgtable.h linux-2.6.31.6/arch/alpha/include/asm/pgtable.h
---- linux-2.6.31.6/arch/alpha/include/asm/pgtable.h	2009-11-10 18:45:29.000000000 -0500
-+++ linux-2.6.31.6/arch/alpha/include/asm/pgtable.h	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/alpha/include/asm/pgtable.h	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/alpha/include/asm/pgtable.h	2009-12-04 09:42:35.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)
@@ -84,8 +222,8 @@
  
  #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
 diff -urNp linux-2.6.31.6/arch/alpha/kernel/module.c linux-2.6.31.6/arch/alpha/kernel/module.c
---- linux-2.6.31.6/arch/alpha/kernel/module.c	2009-11-10 18:45:29.000000000 -0500
-+++ linux-2.6.31.6/arch/alpha/kernel/module.c	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/alpha/kernel/module.c	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/alpha/kernel/module.c	2009-12-04 09:42:35.000000000 -0500
 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, 
  
  	/* The small sections were sorted to the end of the segment.
@@ -96,8 +234,8 @@
  
  	for (i = 0; i < n; i++) {
 diff -urNp linux-2.6.31.6/arch/alpha/kernel/osf_sys.c linux-2.6.31.6/arch/alpha/kernel/osf_sys.c
---- linux-2.6.31.6/arch/alpha/kernel/osf_sys.c	2009-11-10 18:45:29.000000000 -0500
-+++ linux-2.6.31.6/arch/alpha/kernel/osf_sys.c	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/alpha/kernel/osf_sys.c	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/alpha/kernel/osf_sys.c	2009-12-04 09:42:35.000000000 -0500
 @@ -1212,6 +1212,10 @@ arch_get_unmapped_area(struct file *filp
  	   merely specific addresses, but regions of memory -- perhaps
  	   this feature should be incorporated into all ports?  */
@@ -121,8 +259,8 @@
  		return addr;
  
 diff -urNp linux-2.6.31.6/arch/alpha/mm/fault.c linux-2.6.31.6/arch/alpha/mm/fault.c
---- linux-2.6.31.6/arch/alpha/mm/fault.c	2009-11-10 18:45:29.000000000 -0500
-+++ linux-2.6.31.6/arch/alpha/mm/fault.c	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/alpha/mm/fault.c	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/alpha/mm/fault.c	2009-12-04 09:42:35.000000000 -0500
 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
  	__reload_thread(pcb);
  }
@@ -280,8 +418,8 @@
  		/* Allow reads even for write-only mappings */
  		if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
 diff -urNp linux-2.6.31.6/arch/arm/include/asm/atomic.h linux-2.6.31.6/arch/arm/include/asm/atomic.h
---- linux-2.6.31.6/arch/arm/include/asm/atomic.h	2009-11-10 18:45:34.000000000 -0500
-+++ linux-2.6.31.6/arch/arm/include/asm/atomic.h	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/arm/include/asm/atomic.h	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/arm/include/asm/atomic.h	2009-12-04 09:42:35.000000000 -0500
 @@ -20,6 +20,7 @@
  #ifdef __KERNEL__
  
@@ -343,8 +481,8 @@
  
  #define atomic_inc_and_test(v)	(atomic_add_return(1, v) == 0)
 diff -urNp linux-2.6.31.6/arch/arm/include/asm/elf.h linux-2.6.31.6/arch/arm/include/asm/elf.h
---- linux-2.6.31.6/arch/arm/include/asm/elf.h	2009-11-10 18:45:34.000000000 -0500
-+++ linux-2.6.31.6/arch/arm/include/asm/elf.h	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/arm/include/asm/elf.h	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/arm/include/asm/elf.h	2009-12-04 09:42:35.000000000 -0500
 @@ -103,7 +103,14 @@ extern int arm_elf_read_implies_exec(con
     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.  */
@@ -362,8 +500,8 @@
  /* 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.31.6/arch/arm/include/asm/kmap_types.h linux-2.6.31.6/arch/arm/include/asm/kmap_types.h
---- linux-2.6.31.6/arch/arm/include/asm/kmap_types.h	2009-11-10 18:45:34.000000000 -0500
-+++ linux-2.6.31.6/arch/arm/include/asm/kmap_types.h	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/arm/include/asm/kmap_types.h	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/arm/include/asm/kmap_types.h	2009-12-04 09:42:35.000000000 -0500
 @@ -19,6 +19,7 @@ enum km_type {
  	KM_SOFTIRQ0,
  	KM_SOFTIRQ1,
@@ -373,8 +511,8 @@
  };
  
 diff -urNp linux-2.6.31.6/arch/arm/include/asm/uaccess.h linux-2.6.31.6/arch/arm/include/asm/uaccess.h
---- linux-2.6.31.6/arch/arm/include/asm/uaccess.h	2009-11-10 18:45:35.000000000 -0500
-+++ linux-2.6.31.6/arch/arm/include/asm/uaccess.h	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/arm/include/asm/uaccess.h	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/arm/include/asm/uaccess.h	2009-12-04 09:42:35.000000000 -0500
 @@ -400,6 +400,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)
@@ -396,8 +534,8 @@
  		n = __copy_to_user(to, from, n);
  	return n;
 diff -urNp linux-2.6.31.6/arch/arm/mach-ns9xxx/clock.c linux-2.6.31.6/arch/arm/mach-ns9xxx/clock.c
---- linux-2.6.31.6/arch/arm/mach-ns9xxx/clock.c	2009-11-10 18:45:34.000000000 -0500
-+++ linux-2.6.31.6/arch/arm/mach-ns9xxx/clock.c	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/arm/mach-ns9xxx/clock.c	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/arm/mach-ns9xxx/clock.c	2009-12-04 09:42:35.000000000 -0500
 @@ -195,7 +195,7 @@ static int clk_debugfs_open(struct inode
  	return single_open(file, clk_debugfs_show, NULL);
  }
@@ -408,8 +546,8 @@
  	.read = seq_read,
  	.llseek = seq_lseek,
 diff -urNp linux-2.6.31.6/arch/arm/mm/mmap.c linux-2.6.31.6/arch/arm/mm/mmap.c
---- linux-2.6.31.6/arch/arm/mm/mmap.c	2009-11-10 18:45:34.000000000 -0500
-+++ linux-2.6.31.6/arch/arm/mm/mmap.c	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/arm/mm/mmap.c	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/arm/mm/mmap.c	2009-12-04 09:42:35.000000000 -0500
 @@ -62,6 +62,10 @@ arch_get_unmapped_area(struct file *filp
  	if (len > TASK_SIZE)
  		return -ENOMEM;
@@ -447,8 +585,8 @@
  				goto full_search;
  			}
 diff -urNp linux-2.6.31.6/arch/avr32/include/asm/atomic.h linux-2.6.31.6/arch/avr32/include/asm/atomic.h
---- linux-2.6.31.6/arch/avr32/include/asm/atomic.h	2009-11-10 18:45:33.000000000 -0500
-+++ linux-2.6.31.6/arch/avr32/include/asm/atomic.h	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/avr32/include/asm/atomic.h	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/avr32/include/asm/atomic.h	2009-12-04 09:42:35.000000000 -0500
 @@ -20,7 +20,9 @@
  #define ATOMIC_INIT(i)  { (i) }
  
@@ -511,8 +649,8 @@
  #define atomic_dec_return(v)	atomic_sub_return(1, v)
  #define atomic_inc_return(v)	atomic_add_return(1, v)
 diff -urNp linux-2.6.31.6/arch/avr32/include/asm/elf.h linux-2.6.31.6/arch/avr32/include/asm/elf.h
---- linux-2.6.31.6/arch/avr32/include/asm/elf.h	2009-11-10 18:45:33.000000000 -0500
-+++ linux-2.6.31.6/arch/avr32/include/asm/elf.h	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/avr32/include/asm/elf.h	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/avr32/include/asm/elf.h	2009-12-04 09:42:35.000000000 -0500
 @@ -85,8 +85,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.  */
@@ -530,8 +668,8 @@
  /* 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.31.6/arch/avr32/include/asm/kmap_types.h linux-2.6.31.6/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.31.6/arch/avr32/include/asm/kmap_types.h	2009-11-10 18:45:33.000000000 -0500
-+++ linux-2.6.31.6/arch/avr32/include/asm/kmap_types.h	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/avr32/include/asm/kmap_types.h	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/avr32/include/asm/kmap_types.h	2009-12-04 09:42:35.000000000 -0500
 @@ -22,7 +22,8 @@ D(10)	KM_IRQ0,
  D(11)	KM_IRQ1,
  D(12)	KM_SOFTIRQ0,
@@ -543,8 +681,8 @@
  
  #undef D
 diff -urNp linux-2.6.31.6/arch/avr32/mm/fault.c linux-2.6.31.6/arch/avr32/mm/fault.c
---- linux-2.6.31.6/arch/avr32/mm/fault.c	2009-11-10 18:45:33.000000000 -0500
-+++ linux-2.6.31.6/arch/avr32/mm/fault.c	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/avr32/mm/fault.c	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/avr32/mm/fault.c	2009-12-04 09:42:35.000000000 -0500
 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
  
  int exception_trace = 1;
@@ -587,8 +725,8 @@
  			printk("%s%s[%d]: segfault at %08lx pc %08lx "
  			       "sp %08lx ecr %lu\n",
 diff -urNp linux-2.6.31.6/arch/blackfin/include/asm/atomic.h linux-2.6.31.6/arch/blackfin/include/asm/atomic.h
---- linux-2.6.31.6/arch/blackfin/include/asm/atomic.h	2009-11-10 18:45:32.000000000 -0500
-+++ linux-2.6.31.6/arch/blackfin/include/asm/atomic.h	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/blackfin/include/asm/atomic.h	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/blackfin/include/asm/atomic.h	2009-12-04 09:42:35.000000000 -0500
 @@ -15,8 +15,10 @@
  
  #define ATOMIC_INIT(i)	{ (i) }
@@ -635,8 +773,8 @@
  {
  	__raw_atomic_update_asm(&v->counter, -1);
 diff -urNp linux-2.6.31.6/arch/blackfin/mach-bf561/coreb.c linux-2.6.31.6/arch/blackfin/mach-bf561/coreb.c
---- linux-2.6.31.6/arch/blackfin/mach-bf561/coreb.c	2009-11-10 18:45:32.000000000 -0500
-+++ linux-2.6.31.6/arch/blackfin/mach-bf561/coreb.c	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/blackfin/mach-bf561/coreb.c	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/blackfin/mach-bf561/coreb.c	2009-12-04 09:42:35.000000000 -0500
 @@ -48,7 +48,7 @@ coreb_ioctl(struct inode *inode, struct 
  	return ret;
  }
@@ -647,8 +785,8 @@
  	.ioctl   = coreb_ioctl,
  };
 diff -urNp linux-2.6.31.6/arch/cris/arch-v10/drivers/sync_serial.c linux-2.6.31.6/arch/cris/arch-v10/drivers/sync_serial.c
---- linux-2.6.31.6/arch/cris/arch-v10/drivers/sync_serial.c	2009-11-10 18:45:31.000000000 -0500
-+++ linux-2.6.31.6/arch/cris/arch-v10/drivers/sync_serial.c	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/cris/arch-v10/drivers/sync_serial.c	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/cris/arch-v10/drivers/sync_serial.c	2009-12-04 09:42:35.000000000 -0500
 @@ -244,7 +244,7 @@ static unsigned sync_serial_prescale_sha
  
  #define NUMBER_OF_PORTS 2
@@ -659,8 +797,8 @@
  	.write   = sync_serial_write,
  	.read    = sync_serial_read,
 diff -urNp linux-2.6.31.6/arch/cris/arch-v32/drivers/mach-fs/gpio.c linux-2.6.31.6/arch/cris/arch-v32/drivers/mach-fs/gpio.c
---- linux-2.6.31.6/arch/cris/arch-v32/drivers/mach-fs/gpio.c	2009-11-10 18:45:31.000000000 -0500
-+++ linux-2.6.31.6/arch/cris/arch-v32/drivers/mach-fs/gpio.c	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/cris/arch-v32/drivers/mach-fs/gpio.c	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/cris/arch-v32/drivers/mach-fs/gpio.c	2009-12-04 09:42:35.000000000 -0500
 @@ -855,7 +855,7 @@ gpio_leds_ioctl(unsigned int cmd, unsign
  	return 0;
  }
@@ -671,8 +809,8 @@
  	.poll        = gpio_poll,
  	.ioctl       = gpio_ioctl,
 diff -urNp linux-2.6.31.6/arch/cris/include/asm/atomic.h linux-2.6.31.6/arch/cris/include/asm/atomic.h
---- linux-2.6.31.6/arch/cris/include/asm/atomic.h	2009-11-10 18:45:32.000000000 -0500
-+++ linux-2.6.31.6/arch/cris/include/asm/atomic.h	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/cris/include/asm/atomic.h	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/cris/include/asm/atomic.h	2009-12-04 09:42:35.000000000 -0500
 @@ -16,7 +16,9 @@
  #define ATOMIC_INIT(i)  { (i) }
  
@@ -720,8 +858,8 @@
  {
  	unsigned long flags;
 diff -urNp linux-2.6.31.6/arch/frv/include/asm/atomic.h linux-2.6.31.6/arch/frv/include/asm/atomic.h
---- linux-2.6.31.6/arch/frv/include/asm/atomic.h	2009-11-10 18:45:29.000000000 -0500
-+++ linux-2.6.31.6/arch/frv/include/asm/atomic.h	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/frv/include/asm/atomic.h	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/frv/include/asm/atomic.h	2009-12-04 09:42:35.000000000 -0500
 @@ -37,7 +37,9 @@
  
  #define ATOMIC_INIT(i)		{ (i) }
@@ -765,8 +903,8 @@
  {
  	atomic_sub_return(1, v);
 diff -urNp linux-2.6.31.6/arch/frv/include/asm/kmap_types.h linux-2.6.31.6/arch/frv/include/asm/kmap_types.h
---- linux-2.6.31.6/arch/frv/include/asm/kmap_types.h	2009-11-10 18:45:29.000000000 -0500
-+++ linux-2.6.31.6/arch/frv/include/asm/kmap_types.h	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/frv/include/asm/kmap_types.h	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/frv/include/asm/kmap_types.h	2009-12-04 09:42:35.000000000 -0500
 @@ -23,6 +23,7 @@ enum km_type {
  	KM_IRQ1,
  	KM_SOFTIRQ0,
@@ -776,8 +914,8 @@
  };
  
 diff -urNp linux-2.6.31.6/arch/h8300/include/asm/atomic.h linux-2.6.31.6/arch/h8300/include/asm/atomic.h
---- linux-2.6.31.6/arch/h8300/include/asm/atomic.h	2009-11-10 18:45:32.000000000 -0500
-+++ linux-2.6.31.6/arch/h8300/include/asm/atomic.h	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/h8300/include/asm/atomic.h	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/h8300/include/asm/atomic.h	2009-12-04 09:42:35.000000000 -0500
 @@ -11,7 +11,9 @@
  #define ATOMIC_INIT(i)	{ (i) }
  
@@ -831,8 +969,8 @@
  /*
   * atomic_inc_and_test - increment and test
 diff -urNp linux-2.6.31.6/arch/ia64/ia32/binfmt_elf32.c linux-2.6.31.6/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.31.6/arch/ia64/ia32/binfmt_elf32.c	2009-11-10 18:45:33.000000000 -0500
-+++ linux-2.6.31.6/arch/ia64/ia32/binfmt_elf32.c	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/ia64/ia32/binfmt_elf32.c	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/ia64/ia32/binfmt_elf32.c	2009-12-04 09:42:35.000000000 -0500
 @@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_
  
  #define elf_read_implies_exec(ex, have_pt_gnu_stack)	(!(have_pt_gnu_stack))
@@ -862,8 +1000,8 @@
  };
  
 diff -urNp linux-2.6.31.6/arch/ia64/ia32/ia32priv.h linux-2.6.31.6/arch/ia64/ia32/ia32priv.h
---- linux-2.6.31.6/arch/ia64/ia32/ia32priv.h	2009-11-10 18:45:33.000000000 -0500
-+++ linux-2.6.31.6/arch/ia64/ia32/ia32priv.h	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/ia64/ia32/ia32priv.h	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/ia64/ia32/ia32priv.h	2009-12-04 09:42:35.000000000 -0500
 @@ -296,7 +296,14 @@ typedef struct compat_siginfo {
  #define ELF_DATA	ELFDATA2LSB
  #define ELF_ARCH	EM_386
@@ -881,8 +1019,8 @@
  #define IA32_GATE_END		IA32_PAGE_OFFSET + PAGE_SIZE
  
 diff -urNp linux-2.6.31.6/arch/ia64/include/asm/atomic.h linux-2.6.31.6/arch/ia64/include/asm/atomic.h
---- linux-2.6.31.6/arch/ia64/include/asm/atomic.h	2009-11-10 18:45:33.000000000 -0500
-+++ linux-2.6.31.6/arch/ia64/include/asm/atomic.h	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/ia64/include/asm/atomic.h	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/ia64/include/asm/atomic.h	2009-12-04 09:42:35.000000000 -0500
 @@ -22,9 +22,11 @@
  #define ATOMIC64_INIT(i)	((atomic64_t) { (i) })
  
@@ -908,8 +1046,8 @@
  
  #define atomic64_add(i,v)		atomic64_add_return((i), (v))
 diff -urNp linux-2.6.31.6/arch/ia64/include/asm/elf.h linux-2.6.31.6/arch/ia64/include/asm/elf.h
---- linux-2.6.31.6/arch/ia64/include/asm/elf.h	2009-11-10 18:45:33.000000000 -0500
-+++ linux-2.6.31.6/arch/ia64/include/asm/elf.h	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/ia64/include/asm/elf.h	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/ia64/include/asm/elf.h	2009-12-04 09:42:35.000000000 -0500
 @@ -43,6 +43,13 @@
   */
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -925,8 +1063,8 @@
  
  /* IA-64 relocations: */
 diff -urNp linux-2.6.31.6/arch/ia64/include/asm/pgtable.h linux-2.6.31.6/arch/ia64/include/asm/pgtable.h
---- linux-2.6.31.6/arch/ia64/include/asm/pgtable.h	2009-11-10 18:45:33.000000000 -0500
-+++ linux-2.6.31.6/arch/ia64/include/asm/pgtable.h	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/ia64/include/asm/pgtable.h	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/ia64/include/asm/pgtable.h	2009-12-04 09:42:35.000000000 -0500
 @@ -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)
@@ -946,8 +1084,8 @@
  #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.31.6/arch/ia64/include/asm/uaccess.h linux-2.6.31.6/arch/ia64/include/asm/uaccess.h
---- linux-2.6.31.6/arch/ia64/include/asm/uaccess.h	2009-11-10 18:45:33.000000000 -0500
-+++ linux-2.6.31.6/arch/ia64/include/asm/uaccess.h	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/ia64/include/asm/uaccess.h	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/ia64/include/asm/uaccess.h	2009-12-04 09:42:35.000000000 -0500
 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
  	const void *__cu_from = (from);							\
  	long __cu_len = (n);								\
@@ -967,8 +1105,8 @@
  	__cu_len;									\
  })
 diff -urNp linux-2.6.31.6/arch/ia64/kernel/module.c linux-2.6.31.6/arch/ia64/kernel/module.c
---- linux-2.6.31.6/arch/ia64/kernel/module.c	2009-11-10 18:45:33.000000000 -0500
-+++ linux-2.6.31.6/arch/ia64/kernel/module.c	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/ia64/kernel/module.c	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/ia64/kernel/module.c	2009-12-04 09:42:35.000000000 -0500
 @@ -315,8 +315,7 @@ module_alloc (unsigned long size)
  void
  module_free (struct module *mod, void *module_region)
@@ -1058,8 +1196,8 @@
  		DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
  	}
 diff -urNp linux-2.6.31.6/arch/ia64/kernel/sys_ia64.c linux-2.6.31.6/arch/ia64/kernel/sys_ia64.c
---- linux-2.6.31.6/arch/ia64/kernel/sys_ia64.c	2009-11-10 18:45:33.000000000 -0500
-+++ linux-2.6.31.6/arch/ia64/kernel/sys_ia64.c	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/ia64/kernel/sys_ia64.c	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/ia64/kernel/sys_ia64.c	2009-12-04 09:42:35.000000000 -0500
 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
  	if (REGION_NUMBER(addr) == RGN_HPAGE)
  		addr = 0;
@@ -1087,8 +1225,8 @@
  			}
  			return -ENOMEM;
 diff -urNp linux-2.6.31.6/arch/ia64/kernel/topology.c linux-2.6.31.6/arch/ia64/kernel/topology.c
---- linux-2.6.31.6/arch/ia64/kernel/topology.c	2009-11-10 18:45:33.000000000 -0500
-+++ linux-2.6.31.6/arch/ia64/kernel/topology.c	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/ia64/kernel/topology.c	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/ia64/kernel/topology.c	2009-12-04 09:42:35.000000000 -0500
 @@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject
  	return ret;
  }
@@ -1099,8 +1237,8 @@
  };
  
 diff -urNp linux-2.6.31.6/arch/ia64/kernel/vmlinux.lds.S linux-2.6.31.6/arch/ia64/kernel/vmlinux.lds.S
---- linux-2.6.31.6/arch/ia64/kernel/vmlinux.lds.S	2009-11-10 18:45:33.000000000 -0500
-+++ linux-2.6.31.6/arch/ia64/kernel/vmlinux.lds.S	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/ia64/kernel/vmlinux.lds.S	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/ia64/kernel/vmlinux.lds.S	2009-12-04 09:42:35.000000000 -0500
 @@ -245,7 +245,7 @@ SECTIONS
    /* Per-cpu data: */
    . = ALIGN(PERCPU_PAGE_SIZE);
@@ -1111,8 +1249,8 @@
    						 * into percpu page size
  						 */
 diff -urNp linux-2.6.31.6/arch/ia64/mm/fault.c linux-2.6.31.6/arch/ia64/mm/fault.c
---- linux-2.6.31.6/arch/ia64/mm/fault.c	2009-11-10 18:45:33.000000000 -0500
-+++ linux-2.6.31.6/arch/ia64/mm/fault.c	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/ia64/mm/fault.c	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/ia64/mm/fault.c	2009-12-04 09:42:35.000000000 -0500
 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned 
  	return pte_present(pte);
  }
@@ -1163,8 +1301,8 @@
  	/*
  	 * If for any reason at all we couldn't handle the fault, make
 diff -urNp linux-2.6.31.6/arch/ia64/mm/init.c linux-2.6.31.6/arch/ia64/mm/init.c
---- linux-2.6.31.6/arch/ia64/mm/init.c	2009-11-10 18:45:33.000000000 -0500
-+++ linux-2.6.31.6/arch/ia64/mm/init.c	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/ia64/mm/init.c	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/ia64/mm/init.c	2009-12-04 09:42:35.000000000 -0500
 @@ -122,6 +122,19 @@ ia64_init_addr_space (void)
  		vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
  		vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1186,8 +1324,8 @@
  		down_write(&current->mm->mmap_sem);
  		if (insert_vm_struct(current->mm, vma)) {
 diff -urNp linux-2.6.31.6/arch/ia64/pci/pci.c linux-2.6.31.6/arch/ia64/pci/pci.c
---- linux-2.6.31.6/arch/ia64/pci/pci.c	2009-11-10 18:45:33.000000000 -0500
-+++ linux-2.6.31.6/arch/ia64/pci/pci.c	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/ia64/pci/pci.c	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/ia64/pci/pci.c	2009-12-04 09:42:35.000000000 -0500
 @@ -56,10 +56,13 @@ int raw_pci_read(unsigned int seg, unsig
  	if ((seg | reg) <= 255) {
  		addr = PCI_SAL_ADDRESS(seg, bus, devfn, reg);
@@ -1219,8 +1357,8 @@
  	if (result != 0)
  		return -EINVAL;
 diff -urNp linux-2.6.31.6/arch/m32r/include/asm/atomic.h linux-2.6.31.6/arch/m32r/include/asm/atomic.h
---- linux-2.6.31.6/arch/m32r/include/asm/atomic.h	2009-11-10 18:45:29.000000000 -0500
-+++ linux-2.6.31.6/arch/m32r/include/asm/atomic.h	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/m32r/include/asm/atomic.h	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/m32r/include/asm/atomic.h	2009-12-04 09:42:35.000000000 -0500
 @@ -29,6 +29,14 @@
  #define atomic_read(v)	((v)->counter)
  
@@ -1264,8 +1402,8 @@
  #define smp_mb__before_atomic_dec()	barrier()
  #define smp_mb__after_atomic_dec()	barrier()
 diff -urNp linux-2.6.31.6/arch/m32r/lib/usercopy.c linux-2.6.31.6/arch/m32r/lib/usercopy.c
---- linux-2.6.31.6/arch/m32r/lib/usercopy.c	2009-11-10 18:45:29.000000000 -0500
-+++ linux-2.6.31.6/arch/m32r/lib/usercopy.c	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/m32r/lib/usercopy.c	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/m32r/lib/usercopy.c	2009-12-04 09:42:35.000000000 -0500
 @@ -14,6 +14,9 @@
  unsigned long
  __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1287,8 +1425,8 @@
  	if (access_ok(VERIFY_READ, from, n))
  		__copy_user_zeroing(to,from,n);
 diff -urNp linux-2.6.31.6/arch/m68k/include/asm/atomic_mm.h linux-2.6.31.6/arch/m68k/include/asm/atomic_mm.h
---- linux-2.6.31.6/arch/m68k/include/asm/atomic_mm.h	2009-11-10 18:45:27.000000000 -0500
-+++ linux-2.6.31.6/arch/m68k/include/asm/atomic_mm.h	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/m68k/include/asm/atomic_mm.h	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/m68k/include/asm/atomic_mm.h	2009-12-04 09:42:35.000000000 -0500
 @@ -16,23 +16,40 @@
  #define ATOMIC_INIT(i)	{ (i) }
  
@@ -1331,8 +1469,8 @@
  {
  	__asm__ __volatile__("subql #1,%0" : "+m" (*v));
 diff -urNp linux-2.6.31.6/arch/m68k/include/asm/atomic_no.h linux-2.6.31.6/arch/m68k/include/asm/atomic_no.h
---- linux-2.6.31.6/arch/m68k/include/asm/atomic_no.h	2009-11-10 18:45:27.000000000 -0500
-+++ linux-2.6.31.6/arch/m68k/include/asm/atomic_no.h	2009-11-12 17:18:17.000000000 -0500
+--- linux-2.6.31.6/arch/m68k/include/asm/atomic_no.h	2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.6/arch/m68k/include/asm/atomic_no.h	2009-12-04 09:42:35.000000000 -0500
 @@ -16,7 +16,9 @@
  #define ATOMIC_INIT(i)	{ (i) }
  
@@ -1380,8 +1518,8 @@
   * atomic_inc_and_test - increment and test
   * @v: pointer of type atomic_t
 diff -urNp linux-2.6.31.6/arch/mips/include/asm/atomic.h linux-2.6.31.6/arch/mips/include/asm/atomic.h
---- linux-2.6.31.6/arch/mips/include/asm/atomic.h	2009-11-10 18:45:39.000000000 -0500
<<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.20&r2=1.3.2.21&f=u



More information about the pld-cvs-commit mailing list