packages (Titanium): kernel-bare-grsecurity/linux-2.6-grsecurity.patch - ht...
hawk
hawk at pld-linux.org
Fri Dec 11 16:21:57 CET 2009
Author: hawk Date: Fri Dec 11 15:21:57 2009 GMT
Module: packages Tag: Titanium
---- Log message:
- http://www.grsecurity.net/~spender/grsecurity-2.1.14-2.6.31.7-200912102215.patch
with localversion killed
---- Files affected:
packages/kernel-bare-grsecurity:
linux-2.6-grsecurity.patch (1.1.2.48 -> 1.1.2.49)
---- Diffs:
================================================================
Index: packages/kernel-bare-grsecurity/linux-2.6-grsecurity.patch
diff -u packages/kernel-bare-grsecurity/linux-2.6-grsecurity.patch:1.1.2.48 packages/kernel-bare-grsecurity/linux-2.6-grsecurity.patch:1.1.2.49
--- packages/kernel-bare-grsecurity/linux-2.6-grsecurity.patch:1.1.2.48 Sat Oct 24 12:35:15 2009
+++ packages/kernel-bare-grsecurity/linux-2.6-grsecurity.patch Fri Dec 11 16:21:45 2009
@@ -1,6 +1,144 @@
-diff -urNp linux-2.6.31.5/arch/alpha/include/asm/atomic.h linux-2.6.31.5/arch/alpha/include/asm/atomic.h
---- linux-2.6.31.5/arch/alpha/include/asm/atomic.h 2009-10-20 20:42:58.966109165 -0400
-+++ linux-2.6.31.5/arch/alpha/include/asm/atomic.h 2009-10-20 20:32:11.013671975 -0400
+diff -urNp linux-2.6.31.7/Documentation/dontdiff linux-2.6.31.7/Documentation/dontdiff
+--- linux-2.6.31.7/Documentation/dontdiff 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/Documentation/dontdiff 2009-12-10 22:15:16.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.7/Documentation/kernel-parameters.txt linux-2.6.31.7/Documentation/kernel-parameters.txt
+--- linux-2.6.31.7/Documentation/kernel-parameters.txt 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/Documentation/kernel-parameters.txt 2009-12-10 22:15:16.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.7/Makefile linux-2.6.31.7/Makefile
+--- linux-2.6.31.7/Makefile 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/Makefile 2009-12-10 22:15:17.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.7/arch/alpha/include/asm/atomic.h linux-2.6.31.7/arch/alpha/include/asm/atomic.h
+--- linux-2.6.31.7/arch/alpha/include/asm/atomic.h 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/alpha/include/asm/atomic.h 2009-12-10 22:15:15.000000000 -0500
@@ -18,9 +18,11 @@
#define ATOMIC64_INIT(i) ( (atomic64_t) { (i) } )
@@ -45,9 +183,9 @@
#define atomic64_inc(v) atomic64_add(1,(v))
#define atomic_dec(v) atomic_sub(1,(v))
-diff -urNp linux-2.6.31.5/arch/alpha/include/asm/elf.h linux-2.6.31.5/arch/alpha/include/asm/elf.h
---- linux-2.6.31.5/arch/alpha/include/asm/elf.h 2009-10-20 20:42:58.966109165 -0400
-+++ linux-2.6.31.5/arch/alpha/include/asm/elf.h 2009-10-20 20:32:11.013671975 -0400
+diff -urNp linux-2.6.31.7/arch/alpha/include/asm/elf.h linux-2.6.31.7/arch/alpha/include/asm/elf.h
+--- linux-2.6.31.7/arch/alpha/include/asm/elf.h 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/alpha/include/asm/elf.h 2009-12-10 22:15:15.000000000 -0500
@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
@@ -62,9 +200,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.31.5/arch/alpha/include/asm/pgtable.h linux-2.6.31.5/arch/alpha/include/asm/pgtable.h
---- linux-2.6.31.5/arch/alpha/include/asm/pgtable.h 2009-10-20 20:42:58.966109165 -0400
-+++ linux-2.6.31.5/arch/alpha/include/asm/pgtable.h 2009-10-20 20:32:11.013671975 -0400
+diff -urNp linux-2.6.31.7/arch/alpha/include/asm/pgtable.h linux-2.6.31.7/arch/alpha/include/asm/pgtable.h
+--- linux-2.6.31.7/arch/alpha/include/asm/pgtable.h 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/alpha/include/asm/pgtable.h 2009-12-10 22:15:15.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)
@@ -83,9 +221,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.31.5/arch/alpha/kernel/module.c linux-2.6.31.5/arch/alpha/kernel/module.c
---- linux-2.6.31.5/arch/alpha/kernel/module.c 2009-10-20 20:42:58.966109165 -0400
-+++ linux-2.6.31.5/arch/alpha/kernel/module.c 2009-10-20 20:32:11.013671975 -0400
+diff -urNp linux-2.6.31.7/arch/alpha/kernel/module.c linux-2.6.31.7/arch/alpha/kernel/module.c
+--- linux-2.6.31.7/arch/alpha/kernel/module.c 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/alpha/kernel/module.c 2009-12-10 22:15:15.000000000 -0500
@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
/* The small sections were sorted to the end of the segment.
@@ -95,9 +233,9 @@
got = sechdrs[me->arch.gotsecindex].sh_addr;
for (i = 0; i < n; i++) {
-diff -urNp linux-2.6.31.5/arch/alpha/kernel/osf_sys.c linux-2.6.31.5/arch/alpha/kernel/osf_sys.c
---- linux-2.6.31.5/arch/alpha/kernel/osf_sys.c 2009-10-20 20:42:58.967083785 -0400
-+++ linux-2.6.31.5/arch/alpha/kernel/osf_sys.c 2009-10-20 20:32:11.015085037 -0400
+diff -urNp linux-2.6.31.7/arch/alpha/kernel/osf_sys.c linux-2.6.31.7/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.31.7/arch/alpha/kernel/osf_sys.c 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/alpha/kernel/osf_sys.c 2009-12-10 22:15:15.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? */
@@ -120,9 +258,9 @@
if (addr != (unsigned long) -ENOMEM)
return addr;
-diff -urNp linux-2.6.31.5/arch/alpha/mm/fault.c linux-2.6.31.5/arch/alpha/mm/fault.c
---- linux-2.6.31.5/arch/alpha/mm/fault.c 2009-10-20 20:42:58.967083785 -0400
-+++ linux-2.6.31.5/arch/alpha/mm/fault.c 2009-10-20 20:32:11.015085037 -0400
+diff -urNp linux-2.6.31.7/arch/alpha/mm/fault.c linux-2.6.31.7/arch/alpha/mm/fault.c
+--- linux-2.6.31.7/arch/alpha/mm/fault.c 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/alpha/mm/fault.c 2009-12-10 22:15:15.000000000 -0500
@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
__reload_thread(pcb);
}
@@ -279,9 +417,9 @@
} else if (!cause) {
/* Allow reads even for write-only mappings */
if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-2.6.31.5/arch/arm/include/asm/atomic.h linux-2.6.31.5/arch/arm/include/asm/atomic.h
---- linux-2.6.31.5/arch/arm/include/asm/atomic.h 2009-10-20 20:42:58.967083785 -0400
-+++ linux-2.6.31.5/arch/arm/include/asm/atomic.h 2009-10-20 20:32:11.015085037 -0400
+diff -urNp linux-2.6.31.7/arch/arm/include/asm/atomic.h linux-2.6.31.7/arch/arm/include/asm/atomic.h
+--- linux-2.6.31.7/arch/arm/include/asm/atomic.h 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/arm/include/asm/atomic.h 2009-12-10 22:15:15.000000000 -0500
@@ -20,6 +20,7 @@
#ifdef __KERNEL__
@@ -342,9 +480,9 @@
#define atomic_dec(v) atomic_sub(1, v)
#define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
-diff -urNp linux-2.6.31.5/arch/arm/include/asm/elf.h linux-2.6.31.5/arch/arm/include/asm/elf.h
---- linux-2.6.31.5/arch/arm/include/asm/elf.h 2009-10-20 20:42:58.967083785 -0400
-+++ linux-2.6.31.5/arch/arm/include/asm/elf.h 2009-10-20 20:32:11.015085037 -0400
+diff -urNp linux-2.6.31.7/arch/arm/include/asm/elf.h linux-2.6.31.7/arch/arm/include/asm/elf.h
+--- linux-2.6.31.7/arch/arm/include/asm/elf.h 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/arm/include/asm/elf.h 2009-12-10 22:15:15.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. */
@@ -361,9 +499,9 @@
/* 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.5/arch/arm/include/asm/kmap_types.h linux-2.6.31.5/arch/arm/include/asm/kmap_types.h
---- linux-2.6.31.5/arch/arm/include/asm/kmap_types.h 2009-10-20 20:42:58.967083785 -0400
-+++ linux-2.6.31.5/arch/arm/include/asm/kmap_types.h 2009-10-20 20:32:11.015085037 -0400
+diff -urNp linux-2.6.31.7/arch/arm/include/asm/kmap_types.h linux-2.6.31.7/arch/arm/include/asm/kmap_types.h
+--- linux-2.6.31.7/arch/arm/include/asm/kmap_types.h 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/arm/include/asm/kmap_types.h 2009-12-10 22:15:15.000000000 -0500
@@ -19,6 +19,7 @@ enum km_type {
KM_SOFTIRQ0,
KM_SOFTIRQ1,
@@ -372,9 +510,9 @@
KM_TYPE_NR
};
-diff -urNp linux-2.6.31.5/arch/arm/include/asm/uaccess.h linux-2.6.31.5/arch/arm/include/asm/uaccess.h
---- linux-2.6.31.5/arch/arm/include/asm/uaccess.h 2009-10-20 20:42:58.967083785 -0400
-+++ linux-2.6.31.5/arch/arm/include/asm/uaccess.h 2009-10-20 20:32:11.016200356 -0400
+diff -urNp linux-2.6.31.7/arch/arm/include/asm/uaccess.h linux-2.6.31.7/arch/arm/include/asm/uaccess.h
+--- linux-2.6.31.7/arch/arm/include/asm/uaccess.h 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/arm/include/asm/uaccess.h 2009-12-10 22:15:15.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)
@@ -395,9 +533,9 @@
if (access_ok(VERIFY_WRITE, to, n))
n = __copy_to_user(to, from, n);
return n;
-diff -urNp linux-2.6.31.5/arch/arm/mach-ns9xxx/clock.c linux-2.6.31.5/arch/arm/mach-ns9xxx/clock.c
---- linux-2.6.31.5/arch/arm/mach-ns9xxx/clock.c 2009-10-20 20:42:58.968069565 -0400
-+++ linux-2.6.31.5/arch/arm/mach-ns9xxx/clock.c 2009-10-20 20:32:11.016200356 -0400
+diff -urNp linux-2.6.31.7/arch/arm/mach-ns9xxx/clock.c linux-2.6.31.7/arch/arm/mach-ns9xxx/clock.c
+--- linux-2.6.31.7/arch/arm/mach-ns9xxx/clock.c 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/arm/mach-ns9xxx/clock.c 2009-12-10 22:15:15.000000000 -0500
@@ -195,7 +195,7 @@ static int clk_debugfs_open(struct inode
return single_open(file, clk_debugfs_show, NULL);
}
@@ -407,9 +545,9 @@
.open = clk_debugfs_open,
.read = seq_read,
.llseek = seq_lseek,
-diff -urNp linux-2.6.31.5/arch/arm/mm/mmap.c linux-2.6.31.5/arch/arm/mm/mmap.c
---- linux-2.6.31.5/arch/arm/mm/mmap.c 2009-10-20 20:42:58.968069565 -0400
-+++ linux-2.6.31.5/arch/arm/mm/mmap.c 2009-10-20 20:32:11.016200356 -0400
+diff -urNp linux-2.6.31.7/arch/arm/mm/mmap.c linux-2.6.31.7/arch/arm/mm/mmap.c
+--- linux-2.6.31.7/arch/arm/mm/mmap.c 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/arm/mm/mmap.c 2009-12-10 22:15:15.000000000 -0500
@@ -62,6 +62,10 @@ arch_get_unmapped_area(struct file *filp
if (len > TASK_SIZE)
return -ENOMEM;
@@ -446,9 +584,9 @@
mm->cached_hole_size = 0;
goto full_search;
}
-diff -urNp linux-2.6.31.5/arch/avr32/include/asm/atomic.h linux-2.6.31.5/arch/avr32/include/asm/atomic.h
---- linux-2.6.31.5/arch/avr32/include/asm/atomic.h 2009-10-20 20:42:58.968069565 -0400
-+++ linux-2.6.31.5/arch/avr32/include/asm/atomic.h 2009-10-20 20:32:11.026942899 -0400
+diff -urNp linux-2.6.31.7/arch/avr32/include/asm/atomic.h linux-2.6.31.7/arch/avr32/include/asm/atomic.h
+--- linux-2.6.31.7/arch/avr32/include/asm/atomic.h 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/avr32/include/asm/atomic.h 2009-12-10 22:15:15.000000000 -0500
@@ -20,7 +20,9 @@
#define ATOMIC_INIT(i) { (i) }
@@ -510,9 +648,9 @@
#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.5/arch/avr32/include/asm/elf.h linux-2.6.31.5/arch/avr32/include/asm/elf.h
---- linux-2.6.31.5/arch/avr32/include/asm/elf.h 2009-10-20 20:42:58.968069565 -0400
-+++ linux-2.6.31.5/arch/avr32/include/asm/elf.h 2009-10-20 20:32:11.026942899 -0400
+diff -urNp linux-2.6.31.7/arch/avr32/include/asm/elf.h linux-2.6.31.7/arch/avr32/include/asm/elf.h
+--- linux-2.6.31.7/arch/avr32/include/asm/elf.h 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/avr32/include/asm/elf.h 2009-12-10 22:15:15.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. */
@@ -529,9 +667,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.31.5/arch/avr32/include/asm/kmap_types.h linux-2.6.31.5/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.31.5/arch/avr32/include/asm/kmap_types.h 2009-10-20 20:42:58.968069565 -0400
-+++ linux-2.6.31.5/arch/avr32/include/asm/kmap_types.h 2009-10-20 20:32:11.026942899 -0400
+diff -urNp linux-2.6.31.7/arch/avr32/include/asm/kmap_types.h linux-2.6.31.7/arch/avr32/include/asm/kmap_types.h
+--- linux-2.6.31.7/arch/avr32/include/asm/kmap_types.h 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/avr32/include/asm/kmap_types.h 2009-12-10 22:15:15.000000000 -0500
@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
D(11) KM_IRQ1,
D(12) KM_SOFTIRQ0,
@@ -542,9 +680,9 @@
};
#undef D
-diff -urNp linux-2.6.31.5/arch/avr32/mm/fault.c linux-2.6.31.5/arch/avr32/mm/fault.c
---- linux-2.6.31.5/arch/avr32/mm/fault.c 2009-10-20 20:42:58.968069565 -0400
-+++ linux-2.6.31.5/arch/avr32/mm/fault.c 2009-10-20 20:32:11.026942899 -0400
+diff -urNp linux-2.6.31.7/arch/avr32/mm/fault.c linux-2.6.31.7/arch/avr32/mm/fault.c
+--- linux-2.6.31.7/arch/avr32/mm/fault.c 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/avr32/mm/fault.c 2009-12-10 22:15:15.000000000 -0500
@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
int exception_trace = 1;
@@ -586,9 +724,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.31.5/arch/blackfin/include/asm/atomic.h linux-2.6.31.5/arch/blackfin/include/asm/atomic.h
---- linux-2.6.31.5/arch/blackfin/include/asm/atomic.h 2009-10-20 20:42:58.969037301 -0400
-+++ linux-2.6.31.5/arch/blackfin/include/asm/atomic.h 2009-10-20 20:32:11.026942899 -0400
+diff -urNp linux-2.6.31.7/arch/blackfin/include/asm/atomic.h linux-2.6.31.7/arch/blackfin/include/asm/atomic.h
+--- linux-2.6.31.7/arch/blackfin/include/asm/atomic.h 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/blackfin/include/asm/atomic.h 2009-12-10 22:15:15.000000000 -0500
@@ -15,8 +15,10 @@
#define ATOMIC_INIT(i) { (i) }
@@ -634,9 +772,9 @@
static inline void atomic_dec(volatile atomic_t *v)
{
__raw_atomic_update_asm(&v->counter, -1);
-diff -urNp linux-2.6.31.5/arch/blackfin/mach-bf561/coreb.c linux-2.6.31.5/arch/blackfin/mach-bf561/coreb.c
---- linux-2.6.31.5/arch/blackfin/mach-bf561/coreb.c 2009-10-20 20:42:58.969037301 -0400
-+++ linux-2.6.31.5/arch/blackfin/mach-bf561/coreb.c 2009-10-20 20:32:11.026942899 -0400
+diff -urNp linux-2.6.31.7/arch/blackfin/mach-bf561/coreb.c linux-2.6.31.7/arch/blackfin/mach-bf561/coreb.c
+--- linux-2.6.31.7/arch/blackfin/mach-bf561/coreb.c 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/blackfin/mach-bf561/coreb.c 2009-12-10 22:15:15.000000000 -0500
@@ -48,7 +48,7 @@ coreb_ioctl(struct inode *inode, struct
return ret;
}
@@ -646,9 +784,9 @@
.owner = THIS_MODULE,
.ioctl = coreb_ioctl,
};
-diff -urNp linux-2.6.31.5/arch/cris/arch-v10/drivers/sync_serial.c linux-2.6.31.5/arch/cris/arch-v10/drivers/sync_serial.c
---- linux-2.6.31.5/arch/cris/arch-v10/drivers/sync_serial.c 2009-10-20 20:42:58.969037301 -0400
-+++ linux-2.6.31.5/arch/cris/arch-v10/drivers/sync_serial.c 2009-10-20 20:32:11.027918282 -0400
+diff -urNp linux-2.6.31.7/arch/cris/arch-v10/drivers/sync_serial.c linux-2.6.31.7/arch/cris/arch-v10/drivers/sync_serial.c
+--- linux-2.6.31.7/arch/cris/arch-v10/drivers/sync_serial.c 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/cris/arch-v10/drivers/sync_serial.c 2009-12-10 22:15:15.000000000 -0500
@@ -244,7 +244,7 @@ static unsigned sync_serial_prescale_sha
#define NUMBER_OF_PORTS 2
@@ -658,9 +796,9 @@
.owner = THIS_MODULE,
.write = sync_serial_write,
.read = sync_serial_read,
-diff -urNp linux-2.6.31.5/arch/cris/arch-v32/drivers/mach-fs/gpio.c linux-2.6.31.5/arch/cris/arch-v32/drivers/mach-fs/gpio.c
---- linux-2.6.31.5/arch/cris/arch-v32/drivers/mach-fs/gpio.c 2009-10-20 20:42:58.969037301 -0400
-+++ linux-2.6.31.5/arch/cris/arch-v32/drivers/mach-fs/gpio.c 2009-10-20 20:32:11.027918282 -0400
+diff -urNp linux-2.6.31.7/arch/cris/arch-v32/drivers/mach-fs/gpio.c linux-2.6.31.7/arch/cris/arch-v32/drivers/mach-fs/gpio.c
+--- linux-2.6.31.7/arch/cris/arch-v32/drivers/mach-fs/gpio.c 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/cris/arch-v32/drivers/mach-fs/gpio.c 2009-12-10 22:15:15.000000000 -0500
@@ -855,7 +855,7 @@ gpio_leds_ioctl(unsigned int cmd, unsign
return 0;
}
@@ -670,9 +808,9 @@
.owner = THIS_MODULE,
.poll = gpio_poll,
.ioctl = gpio_ioctl,
-diff -urNp linux-2.6.31.5/arch/cris/include/asm/atomic.h linux-2.6.31.5/arch/cris/include/asm/atomic.h
---- linux-2.6.31.5/arch/cris/include/asm/atomic.h 2009-10-20 20:42:58.969037301 -0400
-+++ linux-2.6.31.5/arch/cris/include/asm/atomic.h 2009-10-20 20:32:11.028889957 -0400
+diff -urNp linux-2.6.31.7/arch/cris/include/asm/atomic.h linux-2.6.31.7/arch/cris/include/asm/atomic.h
+--- linux-2.6.31.7/arch/cris/include/asm/atomic.h 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/cris/include/asm/atomic.h 2009-12-10 22:15:15.000000000 -0500
@@ -16,7 +16,9 @@
#define ATOMIC_INIT(i) { (i) }
@@ -719,9 +857,9 @@
static inline void atomic_dec(volatile atomic_t *v)
{
unsigned long flags;
-diff -urNp linux-2.6.31.5/arch/frv/include/asm/atomic.h linux-2.6.31.5/arch/frv/include/asm/atomic.h
---- linux-2.6.31.5/arch/frv/include/asm/atomic.h 2009-10-20 20:42:58.970005584 -0400
-+++ linux-2.6.31.5/arch/frv/include/asm/atomic.h 2009-10-20 20:32:11.028889957 -0400
+diff -urNp linux-2.6.31.7/arch/frv/include/asm/atomic.h linux-2.6.31.7/arch/frv/include/asm/atomic.h
+--- linux-2.6.31.7/arch/frv/include/asm/atomic.h 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/frv/include/asm/atomic.h 2009-12-10 22:15:15.000000000 -0500
@@ -37,7 +37,9 @@
#define ATOMIC_INIT(i) { (i) }
@@ -764,9 +902,9 @@
static inline void atomic_dec(atomic_t *v)
{
atomic_sub_return(1, v);
-diff -urNp linux-2.6.31.5/arch/frv/include/asm/kmap_types.h linux-2.6.31.5/arch/frv/include/asm/kmap_types.h
---- linux-2.6.31.5/arch/frv/include/asm/kmap_types.h 2009-10-20 20:42:58.970005584 -0400
-+++ linux-2.6.31.5/arch/frv/include/asm/kmap_types.h 2009-10-20 20:32:11.028889957 -0400
+diff -urNp linux-2.6.31.7/arch/frv/include/asm/kmap_types.h linux-2.6.31.7/arch/frv/include/asm/kmap_types.h
+--- linux-2.6.31.7/arch/frv/include/asm/kmap_types.h 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/frv/include/asm/kmap_types.h 2009-12-10 22:15:15.000000000 -0500
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
@@ -775,9 +913,9 @@
KM_TYPE_NR
};
-diff -urNp linux-2.6.31.5/arch/h8300/include/asm/atomic.h linux-2.6.31.5/arch/h8300/include/asm/atomic.h
---- linux-2.6.31.5/arch/h8300/include/asm/atomic.h 2009-10-20 20:42:58.970005584 -0400
-+++ linux-2.6.31.5/arch/h8300/include/asm/atomic.h 2009-10-20 20:32:11.028889957 -0400
+diff -urNp linux-2.6.31.7/arch/h8300/include/asm/atomic.h linux-2.6.31.7/arch/h8300/include/asm/atomic.h
+--- linux-2.6.31.7/arch/h8300/include/asm/atomic.h 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/h8300/include/asm/atomic.h 2009-12-10 22:15:15.000000000 -0500
@@ -11,7 +11,9 @@
#define ATOMIC_INIT(i) { (i) }
@@ -830,9 +968,9 @@
/*
* atomic_inc_and_test - increment and test
-diff -urNp linux-2.6.31.5/arch/ia64/ia32/binfmt_elf32.c linux-2.6.31.5/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.31.5/arch/ia64/ia32/binfmt_elf32.c 2009-10-20 20:42:58.970005584 -0400
-+++ linux-2.6.31.5/arch/ia64/ia32/binfmt_elf32.c 2009-10-20 20:32:11.028889957 -0400
+diff -urNp linux-2.6.31.7/arch/ia64/ia32/binfmt_elf32.c linux-2.6.31.7/arch/ia64/ia32/binfmt_elf32.c
+--- linux-2.6.31.7/arch/ia64/ia32/binfmt_elf32.c 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/ia64/ia32/binfmt_elf32.c 2009-12-10 22:15:15.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))
@@ -861,9 +999,9 @@
.fault = ia32_install_gate_page
};
-diff -urNp linux-2.6.31.5/arch/ia64/ia32/ia32priv.h linux-2.6.31.5/arch/ia64/ia32/ia32priv.h
---- linux-2.6.31.5/arch/ia64/ia32/ia32priv.h 2009-10-20 20:42:58.970005584 -0400
-+++ linux-2.6.31.5/arch/ia64/ia32/ia32priv.h 2009-10-20 20:32:11.028889957 -0400
+diff -urNp linux-2.6.31.7/arch/ia64/ia32/ia32priv.h linux-2.6.31.7/arch/ia64/ia32/ia32priv.h
+--- linux-2.6.31.7/arch/ia64/ia32/ia32priv.h 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/ia64/ia32/ia32priv.h 2009-12-10 22:15:15.000000000 -0500
@@ -296,7 +296,14 @@ typedef struct compat_siginfo {
#define ELF_DATA ELFDATA2LSB
#define ELF_ARCH EM_386
@@ -880,9 +1018,9 @@
#define IA32_GATE_OFFSET IA32_PAGE_OFFSET
#define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE
-diff -urNp linux-2.6.31.5/arch/ia64/include/asm/atomic.h linux-2.6.31.5/arch/ia64/include/asm/atomic.h
---- linux-2.6.31.5/arch/ia64/include/asm/atomic.h 2009-10-20 20:42:58.970997131 -0400
-+++ linux-2.6.31.5/arch/ia64/include/asm/atomic.h 2009-10-20 20:32:11.028889957 -0400
+diff -urNp linux-2.6.31.7/arch/ia64/include/asm/atomic.h linux-2.6.31.7/arch/ia64/include/asm/atomic.h
+--- linux-2.6.31.7/arch/ia64/include/asm/atomic.h 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/ia64/include/asm/atomic.h 2009-12-10 22:15:15.000000000 -0500
@@ -22,9 +22,11 @@
#define ATOMIC64_INIT(i) ((atomic64_t) { (i) })
@@ -907,9 +1045,9 @@
#define atomic_dec(v) atomic_sub(1, (v))
#define atomic64_add(i,v) atomic64_add_return((i), (v))
-diff -urNp linux-2.6.31.5/arch/ia64/include/asm/elf.h linux-2.6.31.5/arch/ia64/include/asm/elf.h
---- linux-2.6.31.5/arch/ia64/include/asm/elf.h 2009-10-20 20:42:58.970997131 -0400
-+++ linux-2.6.31.5/arch/ia64/include/asm/elf.h 2009-10-20 20:32:11.028889957 -0400
+diff -urNp linux-2.6.31.7/arch/ia64/include/asm/elf.h linux-2.6.31.7/arch/ia64/include/asm/elf.h
+--- linux-2.6.31.7/arch/ia64/include/asm/elf.h 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/ia64/include/asm/elf.h 2009-12-10 22:15:15.000000000 -0500
@@ -43,6 +43,13 @@
*/
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -924,9 +1062,9 @@
#define PT_IA_64_UNWIND 0x70000001
/* IA-64 relocations: */
-diff -urNp linux-2.6.31.5/arch/ia64/include/asm/pgtable.h linux-2.6.31.5/arch/ia64/include/asm/pgtable.h
---- linux-2.6.31.5/arch/ia64/include/asm/pgtable.h 2009-10-20 20:42:58.970997131 -0400
-+++ linux-2.6.31.5/arch/ia64/include/asm/pgtable.h 2009-10-20 20:32:11.030364852 -0400
+diff -urNp linux-2.6.31.7/arch/ia64/include/asm/pgtable.h linux-2.6.31.7/arch/ia64/include/asm/pgtable.h
+--- linux-2.6.31.7/arch/ia64/include/asm/pgtable.h 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/ia64/include/asm/pgtable.h 2009-12-10 22:15:15.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)
@@ -945,9 +1083,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.31.5/arch/ia64/include/asm/uaccess.h linux-2.6.31.5/arch/ia64/include/asm/uaccess.h
---- linux-2.6.31.5/arch/ia64/include/asm/uaccess.h 2009-10-20 20:42:58.970997131 -0400
-+++ linux-2.6.31.5/arch/ia64/include/asm/uaccess.h 2009-10-20 20:32:11.030364852 -0400
+diff -urNp linux-2.6.31.7/arch/ia64/include/asm/uaccess.h linux-2.6.31.7/arch/ia64/include/asm/uaccess.h
+--- linux-2.6.31.7/arch/ia64/include/asm/uaccess.h 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/ia64/include/asm/uaccess.h 2009-12-10 22:15:15.000000000 -0500
@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
const void *__cu_from = (from); \
long __cu_len = (n); \
@@ -966,9 +1104,9 @@
__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
__cu_len; \
})
-diff -urNp linux-2.6.31.5/arch/ia64/kernel/module.c linux-2.6.31.5/arch/ia64/kernel/module.c
---- linux-2.6.31.5/arch/ia64/kernel/module.c 2009-10-20 20:42:58.970997131 -0400
-+++ linux-2.6.31.5/arch/ia64/kernel/module.c 2009-10-20 20:32:11.030364852 -0400
+diff -urNp linux-2.6.31.7/arch/ia64/kernel/module.c linux-2.6.31.7/arch/ia64/kernel/module.c
+--- linux-2.6.31.7/arch/ia64/kernel/module.c 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/ia64/kernel/module.c 2009-12-10 22:15:15.000000000 -0500
@@ -315,8 +315,7 @@ module_alloc (unsigned long size)
void
module_free (struct module *mod, void *module_region)
@@ -1057,9 +1195,9 @@
mod->arch.gp = gp;
DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
}
-diff -urNp linux-2.6.31.5/arch/ia64/kernel/sys_ia64.c linux-2.6.31.5/arch/ia64/kernel/sys_ia64.c
---- linux-2.6.31.5/arch/ia64/kernel/sys_ia64.c 2009-10-20 20:42:58.971967718 -0400
-+++ linux-2.6.31.5/arch/ia64/kernel/sys_ia64.c 2009-10-20 20:32:11.031345603 -0400
+diff -urNp linux-2.6.31.7/arch/ia64/kernel/sys_ia64.c linux-2.6.31.7/arch/ia64/kernel/sys_ia64.c
+--- linux-2.6.31.7/arch/ia64/kernel/sys_ia64.c 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/ia64/kernel/sys_ia64.c 2009-12-10 22:15:15.000000000 -0500
@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
if (REGION_NUMBER(addr) == RGN_HPAGE)
addr = 0;
@@ -1086,9 +1224,9 @@
goto full_search;
}
return -ENOMEM;
-diff -urNp linux-2.6.31.5/arch/ia64/kernel/topology.c linux-2.6.31.5/arch/ia64/kernel/topology.c
---- linux-2.6.31.5/arch/ia64/kernel/topology.c 2009-10-20 20:42:58.971967718 -0400
-+++ linux-2.6.31.5/arch/ia64/kernel/topology.c 2009-10-20 20:33:11.013917396 -0400
+diff -urNp linux-2.6.31.7/arch/ia64/kernel/topology.c linux-2.6.31.7/arch/ia64/kernel/topology.c
+--- linux-2.6.31.7/arch/ia64/kernel/topology.c 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/ia64/kernel/topology.c 2009-12-10 22:15:15.000000000 -0500
@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject
return ret;
}
@@ -1098,9 +1236,9 @@
.show = cache_show
};
-diff -urNp linux-2.6.31.5/arch/ia64/kernel/vmlinux.lds.S linux-2.6.31.5/arch/ia64/kernel/vmlinux.lds.S
---- linux-2.6.31.5/arch/ia64/kernel/vmlinux.lds.S 2009-10-20 20:42:58.971967718 -0400
-+++ linux-2.6.31.5/arch/ia64/kernel/vmlinux.lds.S 2009-10-20 20:32:11.031345603 -0400
+diff -urNp linux-2.6.31.7/arch/ia64/kernel/vmlinux.lds.S linux-2.6.31.7/arch/ia64/kernel/vmlinux.lds.S
+--- linux-2.6.31.7/arch/ia64/kernel/vmlinux.lds.S 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/ia64/kernel/vmlinux.lds.S 2009-12-10 22:15:15.000000000 -0500
@@ -245,7 +245,7 @@ SECTIONS
/* Per-cpu data: */
. = ALIGN(PERCPU_PAGE_SIZE);
@@ -1110,9 +1248,9 @@
. = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits
* into percpu page size
*/
-diff -urNp linux-2.6.31.5/arch/ia64/mm/fault.c linux-2.6.31.5/arch/ia64/mm/fault.c
---- linux-2.6.31.5/arch/ia64/mm/fault.c 2009-10-20 20:42:58.971967718 -0400
-+++ linux-2.6.31.5/arch/ia64/mm/fault.c 2009-10-20 20:32:11.031345603 -0400
+diff -urNp linux-2.6.31.7/arch/ia64/mm/fault.c linux-2.6.31.7/arch/ia64/mm/fault.c
+--- linux-2.6.31.7/arch/ia64/mm/fault.c 2009-12-08 14:13:50.000000000 -0500
++++ linux-2.6.31.7/arch/ia64/mm/fault.c 2009-12-10 22:15:15.000000000 -0500
@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned
return pte_present(pte);
}
@@ -1162,9 +1300,9 @@
survive:
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-bare-grsecurity/linux-2.6-grsecurity.patch?r1=1.1.2.48&r2=1.1.2.49&f=u
More information about the pld-cvs-commit
mailing list