SOURCES (Titanium): linux-2.6-grsecurity.patch - http://www.grsecu...
hawk
hawk at pld-linux.org
Sat Apr 19 12:44:48 CEST 2008
Author: hawk Date: Sat Apr 19 10:44:48 2008 GMT
Module: SOURCES Tag: Titanium
---- Log message:
- http://www.grsecurity.net/~spender/grsecurity-2.1.11-2.6.24.4-200804171953.patch.gz
with localversion killed
---- Files affected:
SOURCES:
linux-2.6-grsecurity.patch (1.1.2.5 -> 1.1.2.6)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-grsecurity.patch
diff -u SOURCES/linux-2.6-grsecurity.patch:1.1.2.5 SOURCES/linux-2.6-grsecurity.patch:1.1.2.6
--- SOURCES/linux-2.6-grsecurity.patch:1.1.2.5 Thu Mar 27 15:43:45 2008
+++ SOURCES/linux-2.6-grsecurity.patch Sat Apr 19 12:44:42 2008
@@ -1,6 +1,6 @@
diff -urNp linux-2.6.24.4/arch/alpha/kernel/module.c linux-2.6.24.4/arch/alpha/kernel/module.c
--- linux-2.6.24.4/arch/alpha/kernel/module.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/alpha/kernel/module.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/alpha/kernel/module.c 2008-03-26 20:21:07.000000000 -0400
@@ -176,7 +176,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
/* The small sections were sorted to the end of the segment.
@@ -12,7 +12,7 @@
for (i = 0; i < n; i++) {
diff -urNp linux-2.6.24.4/arch/alpha/kernel/osf_sys.c linux-2.6.24.4/arch/alpha/kernel/osf_sys.c
--- linux-2.6.24.4/arch/alpha/kernel/osf_sys.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/alpha/kernel/osf_sys.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/alpha/kernel/osf_sys.c 2008-03-26 20:21:07.000000000 -0400
@@ -1288,6 +1288,10 @@ arch_get_unmapped_area(struct file *filp
merely specific addresses, but regions of memory -- perhaps
this feature should be incorporated into all ports? */
@@ -37,7 +37,7 @@
diff -urNp linux-2.6.24.4/arch/alpha/kernel/ptrace.c linux-2.6.24.4/arch/alpha/kernel/ptrace.c
--- linux-2.6.24.4/arch/alpha/kernel/ptrace.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/alpha/kernel/ptrace.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/alpha/kernel/ptrace.c 2008-03-26 20:21:07.000000000 -0400
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/security.h>
@@ -58,7 +58,7 @@
case PTRACE_PEEKTEXT: /* read word at location addr. */
diff -urNp linux-2.6.24.4/arch/alpha/mm/fault.c linux-2.6.24.4/arch/alpha/mm/fault.c
--- linux-2.6.24.4/arch/alpha/mm/fault.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/alpha/mm/fault.c 2008-03-26 18:53:27.000000000 -0400
++++ linux-2.6.24.4/arch/alpha/mm/fault.c 2008-03-26 20:21:07.000000000 -0400
@@ -23,6 +23,7 @@
#include <linux/smp.h>
#include <linux/interrupt.h>
@@ -225,7 +225,7 @@
if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
diff -urNp linux-2.6.24.4/arch/arm/mm/mmap.c linux-2.6.24.4/arch/arm/mm/mmap.c
--- linux-2.6.24.4/arch/arm/mm/mmap.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/arm/mm/mmap.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/arm/mm/mmap.c 2008-03-26 20:21:07.000000000 -0400
@@ -60,6 +60,10 @@ arch_get_unmapped_area(struct file *filp
if (len > TASK_SIZE)
return -ENOMEM;
@@ -264,7 +264,7 @@
}
diff -urNp linux-2.6.24.4/arch/avr32/mm/fault.c linux-2.6.24.4/arch/avr32/mm/fault.c
--- linux-2.6.24.4/arch/avr32/mm/fault.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/avr32/mm/fault.c 2008-03-26 18:53:27.000000000 -0400
++++ linux-2.6.24.4/arch/avr32/mm/fault.c 2008-03-26 20:21:07.000000000 -0400
@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
int exception_trace = 1;
@@ -308,7 +308,7 @@
"sp %08lx ecr %lu\n",
diff -urNp linux-2.6.24.4/arch/ia64/ia32/binfmt_elf32.c linux-2.6.24.4/arch/ia64/ia32/binfmt_elf32.c
--- linux-2.6.24.4/arch/ia64/ia32/binfmt_elf32.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/ia64/ia32/binfmt_elf32.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/ia64/ia32/binfmt_elf32.c 2008-03-26 20:21:07.000000000 -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))
@@ -325,7 +325,7 @@
diff -urNp linux-2.6.24.4/arch/ia64/ia32/ia32priv.h linux-2.6.24.4/arch/ia64/ia32/ia32priv.h
--- linux-2.6.24.4/arch/ia64/ia32/ia32priv.h 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/ia64/ia32/ia32priv.h 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/ia64/ia32/ia32priv.h 2008-03-26 20:21:07.000000000 -0400
@@ -303,7 +303,14 @@ struct old_linux32_dirent {
#define ELF_DATA ELFDATA2LSB
#define ELF_ARCH EM_386
@@ -344,7 +344,7 @@
diff -urNp linux-2.6.24.4/arch/ia64/kernel/module.c linux-2.6.24.4/arch/ia64/kernel/module.c
--- linux-2.6.24.4/arch/ia64/kernel/module.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/ia64/kernel/module.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/ia64/kernel/module.c 2008-03-26 20:21:07.000000000 -0400
@@ -321,7 +321,7 @@ module_alloc (unsigned long size)
void
module_free (struct module *mod, void *module_region)
@@ -434,7 +434,7 @@
}
diff -urNp linux-2.6.24.4/arch/ia64/kernel/ptrace.c linux-2.6.24.4/arch/ia64/kernel/ptrace.c
--- linux-2.6.24.4/arch/ia64/kernel/ptrace.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/ia64/kernel/ptrace.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/ia64/kernel/ptrace.c 2008-03-26 20:21:07.000000000 -0400
@@ -17,6 +17,7 @@
#include <linux/security.h>
#include <linux/audit.h>
@@ -455,7 +455,7 @@
goto out_tsk;
diff -urNp linux-2.6.24.4/arch/ia64/kernel/sys_ia64.c linux-2.6.24.4/arch/ia64/kernel/sys_ia64.c
--- linux-2.6.24.4/arch/ia64/kernel/sys_ia64.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/ia64/kernel/sys_ia64.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/ia64/kernel/sys_ia64.c 2008-03-26 20:21:07.000000000 -0400
@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
if (REGION_NUMBER(addr) == RGN_HPAGE)
addr = 0;
@@ -484,7 +484,7 @@
return -ENOMEM;
diff -urNp linux-2.6.24.4/arch/ia64/mm/fault.c linux-2.6.24.4/arch/ia64/mm/fault.c
--- linux-2.6.24.4/arch/ia64/mm/fault.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/ia64/mm/fault.c 2008-03-26 18:53:27.000000000 -0400
++++ linux-2.6.24.4/arch/ia64/mm/fault.c 2008-03-26 20:21:07.000000000 -0400
@@ -10,6 +10,7 @@
#include <linux/interrupt.h>
#include <linux/kprobes.h>
@@ -544,7 +544,7 @@
* If for any reason at all we couldn't handle the fault, make
diff -urNp linux-2.6.24.4/arch/ia64/mm/init.c linux-2.6.24.4/arch/ia64/mm/init.c
--- linux-2.6.24.4/arch/ia64/mm/init.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/ia64/mm/init.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/ia64/mm/init.c 2008-03-26 20:21:07.000000000 -0400
@@ -20,8 +20,8 @@
#include <linux/proc_fs.h>
#include <linux/bitops.h>
@@ -577,7 +577,7 @@
if (insert_vm_struct(current->mm, vma)) {
diff -urNp linux-2.6.24.4/arch/mips/kernel/binfmt_elfn32.c linux-2.6.24.4/arch/mips/kernel/binfmt_elfn32.c
--- linux-2.6.24.4/arch/mips/kernel/binfmt_elfn32.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/mips/kernel/binfmt_elfn32.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/mips/kernel/binfmt_elfn32.c 2008-03-26 20:21:07.000000000 -0400
@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#undef ELF_ET_DYN_BASE
#define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
@@ -594,7 +594,7 @@
#include <linux/elfcore.h>
diff -urNp linux-2.6.24.4/arch/mips/kernel/binfmt_elfo32.c linux-2.6.24.4/arch/mips/kernel/binfmt_elfo32.c
--- linux-2.6.24.4/arch/mips/kernel/binfmt_elfo32.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/mips/kernel/binfmt_elfo32.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/mips/kernel/binfmt_elfo32.c 2008-03-26 20:21:07.000000000 -0400
@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#undef ELF_ET_DYN_BASE
#define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
@@ -611,7 +611,7 @@
#include <linux/elfcore.h>
diff -urNp linux-2.6.24.4/arch/mips/kernel/syscall.c linux-2.6.24.4/arch/mips/kernel/syscall.c
--- linux-2.6.24.4/arch/mips/kernel/syscall.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/mips/kernel/syscall.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/mips/kernel/syscall.c 2008-03-26 20:21:07.000000000 -0400
@@ -93,6 +93,11 @@ unsigned long arch_get_unmapped_area(str
do_color_align = 0;
if (filp || (flags & MAP_SHARED))
@@ -635,7 +635,7 @@
else
diff -urNp linux-2.6.24.4/arch/mips/mm/fault.c linux-2.6.24.4/arch/mips/mm/fault.c
--- linux-2.6.24.4/arch/mips/mm/fault.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/mips/mm/fault.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/mips/mm/fault.c 2008-03-26 20:21:07.000000000 -0400
@@ -26,6 +26,23 @@
#include <asm/ptrace.h>
#include <asm/highmem.h> /* For VMALLOC_END */
@@ -662,7 +662,7 @@
* and the problem, and then passes it off to one of the appropriate
diff -urNp linux-2.6.24.4/arch/parisc/kernel/module.c linux-2.6.24.4/arch/parisc/kernel/module.c
--- linux-2.6.24.4/arch/parisc/kernel/module.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/parisc/kernel/module.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/parisc/kernel/module.c 2008-03-26 20:21:07.000000000 -0400
@@ -73,16 +73,38 @@
/* three functions to determine where in the module core
@@ -796,7 +796,7 @@
me->arch.unwind_section, table, end, gp);
diff -urNp linux-2.6.24.4/arch/parisc/kernel/sys_parisc.c linux-2.6.24.4/arch/parisc/kernel/sys_parisc.c
--- linux-2.6.24.4/arch/parisc/kernel/sys_parisc.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/parisc/kernel/sys_parisc.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/parisc/kernel/sys_parisc.c 2008-03-26 20:21:07.000000000 -0400
@@ -111,7 +111,7 @@ unsigned long arch_get_unmapped_area(str
if (flags & MAP_FIXED)
return addr;
@@ -808,7 +808,7 @@
addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
diff -urNp linux-2.6.24.4/arch/parisc/kernel/traps.c linux-2.6.24.4/arch/parisc/kernel/traps.c
--- linux-2.6.24.4/arch/parisc/kernel/traps.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/parisc/kernel/traps.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/parisc/kernel/traps.c 2008-03-26 20:21:07.000000000 -0400
@@ -713,9 +713,7 @@ void handle_interruption(int code, struc
down_read(¤t->mm->mmap_sem);
@@ -822,7 +822,7 @@
diff -urNp linux-2.6.24.4/arch/parisc/mm/fault.c linux-2.6.24.4/arch/parisc/mm/fault.c
--- linux-2.6.24.4/arch/parisc/mm/fault.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/parisc/mm/fault.c 2008-03-26 18:53:27.000000000 -0400
++++ linux-2.6.24.4/arch/parisc/mm/fault.c 2008-03-26 20:21:07.000000000 -0400
@@ -16,6 +16,8 @@
#include <linux/sched.h>
#include <linux/interrupt.h>
@@ -995,7 +995,7 @@
* If for any reason at all we couldn't handle the fault, make
diff -urNp linux-2.6.24.4/arch/powerpc/kernel/module_32.c linux-2.6.24.4/arch/powerpc/kernel/module_32.c
--- linux-2.6.24.4/arch/powerpc/kernel/module_32.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/powerpc/kernel/module_32.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/powerpc/kernel/module_32.c 2008-03-26 20:21:07.000000000 -0400
@@ -126,7 +126,7 @@ int module_frob_arch_sections(Elf32_Ehdr
me->arch.core_plt_section = i;
}
@@ -1027,7 +1027,7 @@
while (entry->jump[0]) {
diff -urNp linux-2.6.24.4/arch/powerpc/kernel/signal_32.c linux-2.6.24.4/arch/powerpc/kernel/signal_32.c
--- linux-2.6.24.4/arch/powerpc/kernel/signal_32.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/powerpc/kernel/signal_32.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/powerpc/kernel/signal_32.c 2008-03-26 20:21:07.000000000 -0400
@@ -731,7 +731,7 @@ int handle_rt_signal32(unsigned long sig
/* Save user registers on the stack */
frame = &rt_sf->uc.uc_mcontext;
@@ -1039,7 +1039,7 @@
regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
diff -urNp linux-2.6.24.4/arch/powerpc/kernel/signal_64.c linux-2.6.24.4/arch/powerpc/kernel/signal_64.c
--- linux-2.6.24.4/arch/powerpc/kernel/signal_64.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/powerpc/kernel/signal_64.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/powerpc/kernel/signal_64.c 2008-03-26 20:21:07.000000000 -0400
@@ -369,7 +369,7 @@ int handle_rt_signal64(int signr, struct
current->thread.fpscr.val = 0;
@@ -1051,7 +1051,7 @@
err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
diff -urNp linux-2.6.24.4/arch/powerpc/kernel/vdso.c linux-2.6.24.4/arch/powerpc/kernel/vdso.c
--- linux-2.6.24.4/arch/powerpc/kernel/vdso.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/powerpc/kernel/vdso.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/powerpc/kernel/vdso.c 2008-03-26 20:21:07.000000000 -0400
@@ -211,7 +211,7 @@ int arch_setup_additional_pages(struct l
vdso_base = VDSO32_MBASE;
#endif
@@ -1072,7 +1072,7 @@
goto fail_mmapsem;
diff -urNp linux-2.6.24.4/arch/powerpc/mm/fault.c linux-2.6.24.4/arch/powerpc/mm/fault.c
--- linux-2.6.24.4/arch/powerpc/mm/fault.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/powerpc/mm/fault.c 2008-03-26 18:53:27.000000000 -0400
++++ linux-2.6.24.4/arch/powerpc/mm/fault.c 2008-03-26 20:21:07.000000000 -0400
@@ -29,6 +29,12 @@
#include <linux/module.h>
#include <linux/kprobes.h>
@@ -1499,7 +1499,7 @@
}
diff -urNp linux-2.6.24.4/arch/powerpc/mm/mmap.c linux-2.6.24.4/arch/powerpc/mm/mmap.c
--- linux-2.6.24.4/arch/powerpc/mm/mmap.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/powerpc/mm/mmap.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/powerpc/mm/mmap.c 2008-03-26 20:21:07.000000000 -0400
@@ -75,10 +75,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
@@ -1525,7 +1525,7 @@
}
diff -urNp linux-2.6.24.4/arch/ppc/mm/fault.c linux-2.6.24.4/arch/ppc/mm/fault.c
--- linux-2.6.24.4/arch/ppc/mm/fault.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/ppc/mm/fault.c 2008-03-26 18:53:27.000000000 -0400
++++ linux-2.6.24.4/arch/ppc/mm/fault.c 2008-03-26 20:21:07.000000000 -0400
@@ -25,6 +25,11 @@
#include <linux/interrupt.h>
#include <linux/highmem.h>
@@ -1973,7 +1973,7 @@
}
diff -urNp linux-2.6.24.4/arch/s390/kernel/module.c linux-2.6.24.4/arch/s390/kernel/module.c
--- linux-2.6.24.4/arch/s390/kernel/module.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/s390/kernel/module.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/s390/kernel/module.c 2008-03-26 20:21:07.000000000 -0400
@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
/* Increase core size by size of got & plt and set start
@@ -2047,7 +2047,7 @@
*(unsigned int *) loc = val;
diff -urNp linux-2.6.24.4/arch/sparc/kernel/ptrace.c linux-2.6.24.4/arch/sparc/kernel/ptrace.c
--- linux-2.6.24.4/arch/sparc/kernel/ptrace.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/sparc/kernel/ptrace.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/sparc/kernel/ptrace.c 2008-03-26 20:21:07.000000000 -0400
@@ -19,6 +19,7 @@
#include <linux/smp_lock.h>
#include <linux/security.h>
@@ -2070,7 +2070,7 @@
if (ptrace_attach(child)) {
diff -urNp linux-2.6.24.4/arch/sparc/kernel/sys_sparc.c linux-2.6.24.4/arch/sparc/kernel/sys_sparc.c
--- linux-2.6.24.4/arch/sparc/kernel/sys_sparc.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/sparc/kernel/sys_sparc.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/sparc/kernel/sys_sparc.c 2008-03-26 20:21:07.000000000 -0400
@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
if (ARCH_SUN4C_SUN4 && len > 0x20000000)
return -ENOMEM;
@@ -2082,7 +2082,7 @@
addr = COLOUR_ALIGN(addr);
diff -urNp linux-2.6.24.4/arch/sparc/Makefile linux-2.6.24.4/arch/sparc/Makefile
--- linux-2.6.24.4/arch/sparc/Makefile 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/sparc/Makefile 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/sparc/Makefile 2008-03-26 20:21:07.000000000 -0400
@@ -36,7 +36,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
# Renaming is done to avoid confusing pattern matching rules in 2.5.45 (multy-)
INIT_Y := $(patsubst %/, %/built-in.o, $(init-y))
@@ -2094,7 +2094,7 @@
NET_Y := $(patsubst %/, %/built-in.o, $(net-y))
diff -urNp linux-2.6.24.4/arch/sparc/mm/fault.c linux-2.6.24.4/arch/sparc/mm/fault.c
--- linux-2.6.24.4/arch/sparc/mm/fault.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/sparc/mm/fault.c 2008-03-26 18:53:27.000000000 -0400
++++ linux-2.6.24.4/arch/sparc/mm/fault.c 2008-03-26 20:21:07.000000000 -0400
@@ -21,6 +21,10 @@
#include <linux/interrupt.h>
#include <linux/module.h>
@@ -2385,7 +2385,7 @@
goto bad_area;
diff -urNp linux-2.6.24.4/arch/sparc/mm/init.c linux-2.6.24.4/arch/sparc/mm/init.c
--- linux-2.6.24.4/arch/sparc/mm/init.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/sparc/mm/init.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/sparc/mm/init.c 2008-03-26 20:21:07.000000000 -0400
@@ -336,17 +336,17 @@ void __init paging_init(void)
/* Initialize the protection map with non-constant, MMU dependent values. */
@@ -2412,7 +2412,7 @@
protection_map[14] = PAGE_SHARED;
diff -urNp linux-2.6.24.4/arch/sparc/mm/srmmu.c linux-2.6.24.4/arch/sparc/mm/srmmu.c
--- linux-2.6.24.4/arch/sparc/mm/srmmu.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/sparc/mm/srmmu.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/sparc/mm/srmmu.c 2008-03-26 20:21:07.000000000 -0400
@@ -2157,6 +2157,13 @@ void __init ld_mmu_srmmu(void)
PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -2429,7 +2429,7 @@
diff -urNp linux-2.6.24.4/arch/sparc64/kernel/Makefile linux-2.6.24.4/arch/sparc64/kernel/Makefile
--- linux-2.6.24.4/arch/sparc64/kernel/Makefile 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/sparc64/kernel/Makefile 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/sparc64/kernel/Makefile 2008-03-26 20:21:07.000000000 -0400
@@ -3,7 +3,7 @@
#
@@ -2441,7 +2441,7 @@
diff -urNp linux-2.6.24.4/arch/sparc64/kernel/ptrace.c linux-2.6.24.4/arch/sparc64/kernel/ptrace.c
--- linux-2.6.24.4/arch/sparc64/kernel/ptrace.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/sparc64/kernel/ptrace.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/sparc64/kernel/ptrace.c 2008-03-26 20:21:07.000000000 -0400
@@ -22,6 +22,7 @@
#include <linux/seccomp.h>
#include <linux/audit.h>
@@ -2464,7 +2464,7 @@
if (ptrace_attach(child)) {
diff -urNp linux-2.6.24.4/arch/sparc64/kernel/sys_sparc.c linux-2.6.24.4/arch/sparc64/kernel/sys_sparc.c
--- linux-2.6.24.4/arch/sparc64/kernel/sys_sparc.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/sparc64/kernel/sys_sparc.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/sparc64/kernel/sys_sparc.c 2008-03-26 20:21:07.000000000 -0400
@@ -123,7 +123,7 @@ unsigned long arch_get_unmapped_area(str
/* We do not accept a shared mapping if it would violate
* cache aliasing constraints.
@@ -2545,7 +2545,7 @@
}
diff -urNp linux-2.6.24.4/arch/sparc64/mm/fault.c linux-2.6.24.4/arch/sparc64/mm/fault.c
--- linux-2.6.24.4/arch/sparc64/mm/fault.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/sparc64/mm/fault.c 2008-03-26 18:53:27.000000000 -0400
++++ linux-2.6.24.4/arch/sparc64/mm/fault.c 2008-03-26 20:21:07.000000000 -0400
@@ -20,6 +20,10 @@
#include <linux/kprobes.h>
#include <linux/kallsyms.h>
@@ -2970,7 +2970,7 @@
* was no match. So in such a case we (carefully) read the
diff -urNp linux-2.6.24.4/arch/sparc64/mm/Makefile linux-2.6.24.4/arch/sparc64/mm/Makefile
--- linux-2.6.24.4/arch/sparc64/mm/Makefile 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/sparc64/mm/Makefile 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/sparc64/mm/Makefile 2008-03-26 20:21:07.000000000 -0400
@@ -3,7 +3,7 @@
#
@@ -2982,7 +2982,7 @@
diff -urNp linux-2.6.24.4/arch/v850/kernel/module.c linux-2.6.24.4/arch/v850/kernel/module.c
--- linux-2.6.24.4/arch/v850/kernel/module.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/v850/kernel/module.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/v850/kernel/module.c 2008-03-26 20:21:07.000000000 -0400
@@ -150,8 +150,8 @@ static uint32_t do_plt_call (void *locat
tramp[1] = ((val >> 16) & 0xffff) + 0x610000; /* ...; jmp r1 */
@@ -2996,7 +2996,7 @@
entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
diff -urNp linux-2.6.24.4/arch/x86/boot/bitops.h linux-2.6.24.4/arch/x86/boot/bitops.h
--- linux-2.6.24.4/arch/x86/boot/bitops.h 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/x86/boot/bitops.h 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/x86/boot/bitops.h 2008-03-26 20:21:07.000000000 -0400
@@ -28,7 +28,7 @@ static inline int variable_test_bit(int
u8 v;
const u32 *p = (const u32 *)addr;
@@ -3017,7 +3017,7 @@
#endif /* BOOT_BITOPS_H */
diff -urNp linux-2.6.24.4/arch/x86/boot/boot.h linux-2.6.24.4/arch/x86/boot/boot.h
--- linux-2.6.24.4/arch/x86/boot/boot.h 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/x86/boot/boot.h 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/x86/boot/boot.h 2008-03-26 20:21:07.000000000 -0400
@@ -78,7 +78,7 @@ static inline void io_delay(void)
static inline u16 ds(void)
{
@@ -3038,7 +3038,7 @@
}
diff -urNp linux-2.6.24.4/arch/x86/boot/compressed/head_32.S linux-2.6.24.4/arch/x86/boot/compressed/head_32.S
--- linux-2.6.24.4/arch/x86/boot/compressed/head_32.S 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/x86/boot/compressed/head_32.S 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/x86/boot/compressed/head_32.S 2008-03-26 20:21:07.000000000 -0400
@@ -70,7 +70,7 @@ startup_32:
addl $(CONFIG_PHYSICAL_ALIGN - 1), %ebx
andl $(~(CONFIG_PHYSICAL_ALIGN - 1)), %ebx
@@ -3079,7 +3079,7 @@
2:
diff -urNp linux-2.6.24.4/arch/x86/boot/compressed/misc_32.c linux-2.6.24.4/arch/x86/boot/compressed/misc_32.c
--- linux-2.6.24.4/arch/x86/boot/compressed/misc_32.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/x86/boot/compressed/misc_32.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/x86/boot/compressed/misc_32.c 2008-03-26 20:21:07.000000000 -0400
@@ -113,7 +113,8 @@ typedef unsigned char uch;
typedef unsigned short ush;
typedef unsigned long ulg;
@@ -3101,7 +3101,7 @@
diff -urNp linux-2.6.24.4/arch/x86/boot/compressed/relocs.c linux-2.6.24.4/arch/x86/boot/compressed/relocs.c
--- linux-2.6.24.4/arch/x86/boot/compressed/relocs.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/x86/boot/compressed/relocs.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/x86/boot/compressed/relocs.c 2008-03-26 20:21:07.000000000 -0400
@@ -10,9 +10,13 @@
#define USE_BSD
#include <endian.h>
@@ -3217,7 +3217,7 @@
read_symtabs(fp);
diff -urNp linux-2.6.24.4/arch/x86/boot/cpucheck.c linux-2.6.24.4/arch/x86/boot/cpucheck.c
--- linux-2.6.24.4/arch/x86/boot/cpucheck.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/x86/boot/cpucheck.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/x86/boot/cpucheck.c 2008-03-26 20:21:07.000000000 -0400
@@ -84,7 +84,7 @@ static int has_fpu(void)
u16 fcw = -1, fsw = -1;
u32 cr0;
@@ -3315,7 +3315,7 @@
}
diff -urNp linux-2.6.24.4/arch/x86/boot/edd.c linux-2.6.24.4/arch/x86/boot/edd.c
--- linux-2.6.24.4/arch/x86/boot/edd.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/x86/boot/edd.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/x86/boot/edd.c 2008-03-26 20:21:07.000000000 -0400
@@ -78,7 +78,7 @@ static int get_edd_info(u8 devno, struct
ax = 0x4100;
bx = EDDMAGIC1;
@@ -3345,7 +3345,7 @@
"popw %%es"
diff -urNp linux-2.6.24.4/arch/x86/boot/main.c linux-2.6.24.4/arch/x86/boot/main.c
--- linux-2.6.24.4/arch/x86/boot/main.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/x86/boot/main.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/x86/boot/main.c 2008-03-26 20:21:07.000000000 -0400
@@ -75,7 +75,7 @@ static void keyboard_set_repeat(void)
*/
static void query_ist(void)
@@ -3357,7 +3357,7 @@
"=c" (boot_params.ist_info.event),
diff -urNp linux-2.6.24.4/arch/x86/boot/mca.c linux-2.6.24.4/arch/x86/boot/mca.c
--- linux-2.6.24.4/arch/x86/boot/mca.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/x86/boot/mca.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/x86/boot/mca.c 2008-03-26 20:21:07.000000000 -0400
@@ -21,7 +21,7 @@ int query_mca(void)
u8 err;
u16 es, bx, len;
@@ -3369,7 +3369,7 @@
"movw %%es, %1 ; "
diff -urNp linux-2.6.24.4/arch/x86/boot/memory.c linux-2.6.24.4/arch/x86/boot/memory.c
--- linux-2.6.24.4/arch/x86/boot/memory.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/x86/boot/memory.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/x86/boot/memory.c 2008-03-26 20:21:07.000000000 -0400
@@ -32,7 +32,7 @@ static int detect_memory_e820(void)
/* Important: %edx is clobbered by some BIOSes,
so it must be either used for the error output
@@ -3399,7 +3399,7 @@
diff -urNp linux-2.6.24.4/arch/x86/boot/video.c linux-2.6.24.4/arch/x86/boot/video.c
--- linux-2.6.24.4/arch/x86/boot/video.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/x86/boot/video.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/x86/boot/video.c 2008-03-26 20:21:07.000000000 -0400
@@ -40,7 +40,7 @@ static void store_cursor_position(void)
ax = 0x0300;
@@ -3420,7 +3420,7 @@
diff -urNp linux-2.6.24.4/arch/x86/boot/video-vesa.c linux-2.6.24.4/arch/x86/boot/video-vesa.c
--- linux-2.6.24.4/arch/x86/boot/video-vesa.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/x86/boot/video-vesa.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/x86/boot/video-vesa.c 2008-03-26 20:21:07.000000000 -0400
@@ -41,7 +41,7 @@ static int vesa_probe(void)
ax = 0x4f00;
@@ -3494,7 +3494,7 @@
: "esi");
diff -urNp linux-2.6.24.4/arch/x86/boot/video-vga.c linux-2.6.24.4/arch/x86/boot/video-vga.c
--- linux-2.6.24.4/arch/x86/boot/video-vga.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/x86/boot/video-vga.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/x86/boot/video-vga.c 2008-03-26 20:21:07.000000000 -0400
@@ -225,7 +225,7 @@ static int vga_probe(void)
};
u8 vga_flag;
@@ -3515,7 +3515,7 @@
: "ebx", "ecx", "edx", "esi", "edi");
diff -urNp linux-2.6.24.4/arch/x86/boot/voyager.c linux-2.6.24.4/arch/x86/boot/voyager.c
--- linux-2.6.24.4/arch/x86/boot/voyager.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/x86/boot/voyager.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/x86/boot/voyager.c 2008-03-26 20:21:07.000000000 -0400
@@ -27,7 +27,7 @@ int query_voyager(void)
data_ptr[0] = 0xff; /* Flag on config not found(?) */
@@ -3527,7 +3527,7 @@
"movw %%es, %1 ; "
diff -urNp linux-2.6.24.4/arch/x86/ia32/ia32_binfmt.c linux-2.6.24.4/arch/x86/ia32/ia32_binfmt.c
--- linux-2.6.24.4/arch/x86/ia32/ia32_binfmt.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/x86/ia32/ia32_binfmt.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/x86/ia32/ia32_binfmt.c 2008-03-26 20:21:07.000000000 -0400
@@ -47,12 +47,12 @@
#define AT_SYSINFO 32
#define AT_SYSINFO_EHDR 33
@@ -3581,7 +3581,7 @@
static __init int ia32_binfmt_init(void)
diff -urNp linux-2.6.24.4/arch/x86/ia32/ia32_signal.c linux-2.6.24.4/arch/x86/ia32/ia32_signal.c
--- linux-2.6.24.4/arch/x86/ia32/ia32_signal.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/x86/ia32/ia32_signal.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/x86/ia32/ia32_signal.c 2008-03-26 20:21:07.000000000 -0400
@@ -573,6 +573,7 @@ int ia32_setup_rt_frame(int sig, struct
__NR_ia32_rt_sigreturn,
0x80cd,
@@ -3592,7 +3592,7 @@
}
diff -urNp linux-2.6.24.4/arch/x86/ia32/mmap32.c linux-2.6.24.4/arch/x86/ia32/mmap32.c
--- linux-2.6.24.4/arch/x86/ia32/mmap32.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/x86/ia32/mmap32.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/x86/ia32/mmap32.c 2008-03-26 20:21:07.000000000 -0400
@@ -69,10 +69,22 @@ void ia32_pick_mmap_layout(struct mm_str
(current->personality & ADDR_COMPAT_LAYOUT) ||
current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY) {
@@ -3618,7 +3618,7 @@
}
diff -urNp linux-2.6.24.4/arch/x86/ia32/ptrace32.c linux-2.6.24.4/arch/x86/ia32/ptrace32.c
--- linux-2.6.24.4/arch/x86/ia32/ptrace32.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/x86/ia32/ptrace32.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/x86/ia32/ptrace32.c 2008-03-26 20:21:07.000000000 -0400
@@ -382,7 +382,7 @@ asmlinkage long sys32_ptrace(long reques
/* no checking to be bug-to-bug compatible with i386. */
/* but silence warning */
@@ -3630,7 +3630,7 @@
ret = 0;
diff -urNp linux-2.6.24.4/arch/x86/ia32/syscall32.c linux-2.6.24.4/arch/x86/ia32/syscall32.c
--- linux-2.6.24.4/arch/x86/ia32/syscall32.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/x86/ia32/syscall32.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/x86/ia32/syscall32.c 2008-03-26 20:21:07.000000000 -0400
@@ -30,6 +30,9 @@ int syscall32_setup_pages(struct linux_b
struct mm_struct *mm = current->mm;
int ret;
@@ -3643,7 +3643,7 @@
* MAYWRITE to allow gdb to COW and set breakpoints
diff -urNp linux-2.6.24.4/arch/x86/Kconfig linux-2.6.24.4/arch/x86/Kconfig
--- linux-2.6.24.4/arch/x86/Kconfig 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/x86/Kconfig 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/x86/Kconfig 2008-03-26 20:21:07.000000000 -0400
@@ -792,7 +792,7 @@ config PAGE_OFFSET
hex
default 0xB0000000 if VMSPLIT_3G_OPT
@@ -3685,7 +3685,7 @@
determine their configuration. However, some old PCI motherboards
diff -urNp linux-2.6.24.4/arch/x86/Kconfig.cpu linux-2.6.24.4/arch/x86/Kconfig.cpu
--- linux-2.6.24.4/arch/x86/Kconfig.cpu 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/x86/Kconfig.cpu 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/x86/Kconfig.cpu 2008-03-26 20:21:16.000000000 -0400
@@ -328,7 +328,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
@@ -3700,13 +3700,22 @@
config X86_ALIGNMENT_16
bool
- depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
-+ depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
++ depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
default y
config X86_GOOD_APIC
+@@ -390,7 +390,7 @@ config X86_TSC
+ # generates cmov.
+ config X86_CMOV
+ bool
+- depends on (MK7 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7)
++ depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7)
+ default y
+
+ config X86_MINIMUM_CPU_FAMILY
diff -urNp linux-2.6.24.4/arch/x86/Kconfig.debug linux-2.6.24.4/arch/x86/Kconfig.debug
--- linux-2.6.24.4/arch/x86/Kconfig.debug 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/x86/Kconfig.debug 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/x86/Kconfig.debug 2008-03-26 20:21:07.000000000 -0400
@@ -49,7 +49,7 @@ config DEBUG_PAGEALLOC
config DEBUG_RODATA
@@ -3718,7 +3727,7 @@
in order to catch accidental (and incorrect) writes to such const
diff -urNp linux-2.6.24.4/arch/x86/kernel/acpi/boot.c linux-2.6.24.4/arch/x86/kernel/acpi/boot.c
--- linux-2.6.24.4/arch/x86/kernel/acpi/boot.c 2008-03-24 14:49:18.000000000 -0400
-+++ linux-2.6.24.4/arch/x86/kernel/acpi/boot.c 2008-03-26 17:56:55.000000000 -0400
++++ linux-2.6.24.4/arch/x86/kernel/acpi/boot.c 2008-03-26 20:21:07.000000000 -0400
@@ -1155,7 +1155,7 @@ static struct dmi_system_id __initdata a
DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),
},
@@ -3730,7 +3739,7 @@
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-grsecurity.patch?r1=1.1.2.5&r2=1.1.2.6&f=u
More information about the pld-cvs-commit
mailing list