Author: hawk Date: Fri Jun 20 12:56:32 2008 GMT
Module: SOURCES Tag: Titanium
---- Log message:
-
http://www.grsecurity.net/~spender/grsecurity-2.1.12-2.6.25.7-200806162212.patch
with localversion killed
---- Files affected:
SOURCES:
linux-2.6-grsecurity.patch (1.1.2.17 -> 1.1.2.18)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-grsecurity.patch
diff -u SOURCES/linux-2.6-grsecurity.patch:1.1.2.17
SOURCES/linux-2.6-grsecurity.patch:1.1.2.18
--- SOURCES/linux-2.6-grsecurity.patch:1.1.2.17 Sat Jun 7 21:37:54 2008
+++ SOURCES/linux-2.6-grsecurity.patch Fri Jun 20 14:56:26 2008
@@ -1,96 +1,6 @@
-diff -urNp linux-2.6.25.4/Documentation/dontdiff
linux-2.6.25.4/Documentation/dontdiff
---- linux-2.6.25.4/Documentation/dontdiff 2008-05-15 11:00:12.000000000
-0400
-+++ linux-2.6.25.4/Documentation/dontdiff 2008-06-04 08:52:09.000000000
-0400
-@@ -3,6 +3,7 @@
- *.bin
- *.cpio
- *.css
-+*.dbg
- *.dvi
- *.eps
- *.gif
-@@ -55,6 +56,7 @@ ChangeSet
- Image
- Kerntypes
- MODS.txt
-+Module.markers
- Module.symvers
- PENDING
- SCCS
-@@ -89,6 +91,7 @@ config_data.gz*
- conmakehash
- consolemap_deftbl.c*
- crc32table.h*
-+cpustr.h
- cscope.*
- defkeymap.c*
- devlist.h*
-@@ -137,11 +140,13 @@ miboot*
- mk_elfconfig
- mkboot
- mkbugboot
-+mkcpustr
- mkdep
- mkprep
- mktables
- mktree
- modpost
-+modules.order
- modversions.h*
- offset.h
- offsets.h
-@@ -172,20 +177,24 @@ sm_tbl*
- split-include
- tags
- tftpboot.img
-+timeconst.h
- times.h*
- tkparse
- trix_boot.h
- utsrelease.h*
--vdso.lds
-+vdso*.lds
- version.h*
- vmlinux
- vmlinux-*
- vmlinux.aout
--vmlinux*.lds*
-+vmlinux.bin.all
-+vmlinux*.lds
-+vmlinux.relocs
- vmlinux*.scr
--vsyscall.lds
-+vsyscall*.lds
- wanxlfw.inc
- uImage
- unifdef
-+utsrelease.h
- zImage*
- zconf.hash.c
-diff -urNp linux-2.6.25.4/Makefile linux-2.6.25.4/Makefile
---- linux-2.6.25.4/Makefile 2008-05-15 11:00:12.000000000 -0400
-+++ linux-2.6.25.4/Makefile 2008-06-04 08:52:09.000000000 -0400
-@@ -214,7 +214,7 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
-
- HOSTCC = gcc
- HOSTCXX = g++
--HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
-+HOSTCFLAGS = -Wall -W -Wno-unused -Wno-sign-compare -Wstrict-prototypes -O2
-fomit-frame-pointer
- HOSTCXXFLAGS = -O2
-
- # Decide whether to build built-in, modular, or both.
-@@ -603,7 +603,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.25.4/arch/alpha/kernel/module.c
linux-2.6.25.4/arch/alpha/kernel/module.c
---- linux-2.6.25.4/arch/alpha/kernel/module.c 2008-05-15 11:00:12.000000000
-0400
-+++ linux-2.6.25.4/arch/alpha/kernel/module.c 2008-06-04 08:52:08.000000000
-0400
+diff -urNp linux-2.6.25.7/arch/alpha/kernel/module.c
linux-2.6.25.7/arch/alpha/kernel/module.c
+--- linux-2.6.25.7/arch/alpha/kernel/module.c 2008-05-15 11:00:12.000000000
-0400
++++ linux-2.6.25.7/arch/alpha/kernel/module.c 2008-05-18 16:56:59.000000000
-0400
@@ -176,7 +176,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
/* The small sections were sorted to the end of the segment.
@@ -100,9 +10,9 @@
got = sechdrs[me->arch.gotsecindex].sh_addr;
for (i = 0; i < n; i++) {
-diff -urNp linux-2.6.25.4/arch/alpha/kernel/osf_sys.c
linux-2.6.25.4/arch/alpha/kernel/osf_sys.c
---- linux-2.6.25.4/arch/alpha/kernel/osf_sys.c 2008-05-15 11:00:12.000000000
-0400
-+++ linux-2.6.25.4/arch/alpha/kernel/osf_sys.c 2008-06-04 08:52:08.000000000
-0400
+diff -urNp linux-2.6.25.7/arch/alpha/kernel/osf_sys.c
linux-2.6.25.7/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.25.7/arch/alpha/kernel/osf_sys.c 2008-05-15 11:00:12.000000000
-0400
++++ linux-2.6.25.7/arch/alpha/kernel/osf_sys.c 2008-05-18 16:56:59.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? */
@@ -125,9 +35,9 @@
if (addr != (unsigned long) -ENOMEM)
return addr;
-diff -urNp linux-2.6.25.4/arch/alpha/kernel/ptrace.c
linux-2.6.25.4/arch/alpha/kernel/ptrace.c
---- linux-2.6.25.4/arch/alpha/kernel/ptrace.c 2008-05-15 11:00:12.000000000
-0400
-+++ linux-2.6.25.4/arch/alpha/kernel/ptrace.c 2008-06-04 08:52:08.000000000
-0400
+diff -urNp linux-2.6.25.7/arch/alpha/kernel/ptrace.c
linux-2.6.25.7/arch/alpha/kernel/ptrace.c
+--- linux-2.6.25.7/arch/alpha/kernel/ptrace.c 2008-05-15 11:00:12.000000000
-0400
++++ linux-2.6.25.7/arch/alpha/kernel/ptrace.c 2008-05-18 16:56:59.000000000
-0400
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/security.h>
@@ -146,9 +56,9 @@
switch (request) {
/* When I and D space are separate, these will need to be fixed. */
case PTRACE_PEEKTEXT: /* read word at location addr. */
-diff -urNp linux-2.6.25.4/arch/alpha/mm/fault.c
linux-2.6.25.4/arch/alpha/mm/fault.c
---- linux-2.6.25.4/arch/alpha/mm/fault.c 2008-05-15 11:00:12.000000000
-0400
-+++ linux-2.6.25.4/arch/alpha/mm/fault.c 2008-06-04 08:52:08.000000000
-0400
+diff -urNp linux-2.6.25.7/arch/alpha/mm/fault.c
linux-2.6.25.7/arch/alpha/mm/fault.c
+--- linux-2.6.25.7/arch/alpha/mm/fault.c 2008-05-15 11:00:12.000000000
-0400
++++ linux-2.6.25.7/arch/alpha/mm/fault.c 2008-05-18 16:56:59.000000000
-0400
@@ -23,6 +23,7 @@
#include <linux/smp.h>
#include <linux/interrupt.h>
@@ -313,9 +223,9 @@
} else if (!cause) {
/* Allow reads even for write-only mappings */
if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-2.6.25.4/arch/arm/mm/mmap.c linux-2.6.25.4/arch/arm/mm/mmap.c
---- linux-2.6.25.4/arch/arm/mm/mmap.c 2008-05-15 11:00:12.000000000 -0400
-+++ linux-2.6.25.4/arch/arm/mm/mmap.c 2008-06-04 08:52:08.000000000 -0400
+diff -urNp linux-2.6.25.7/arch/arm/mm/mmap.c linux-2.6.25.7/arch/arm/mm/mmap.c
+--- linux-2.6.25.7/arch/arm/mm/mmap.c 2008-05-15 11:00:12.000000000 -0400
++++ linux-2.6.25.7/arch/arm/mm/mmap.c 2008-05-18 16:56:59.000000000 -0400
@@ -60,6 +60,10 @@ arch_get_unmapped_area(struct file *filp
if (len > TASK_SIZE)
return -ENOMEM;
@@ -352,9 +262,9 @@
mm->cached_hole_size = 0;
goto full_search;
}
-diff -urNp linux-2.6.25.4/arch/avr32/mm/fault.c
linux-2.6.25.4/arch/avr32/mm/fault.c
---- linux-2.6.25.4/arch/avr32/mm/fault.c 2008-05-15 11:00:12.000000000
-0400
-+++ linux-2.6.25.4/arch/avr32/mm/fault.c 2008-06-04 08:52:08.000000000
-0400
+diff -urNp linux-2.6.25.7/arch/avr32/mm/fault.c
linux-2.6.25.7/arch/avr32/mm/fault.c
+--- linux-2.6.25.7/arch/avr32/mm/fault.c 2008-05-15 11:00:12.000000000
-0400
++++ linux-2.6.25.7/arch/avr32/mm/fault.c 2008-05-18 16:56:59.000000000
-0400
@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
int exception_trace = 1;
@@ -396,9 +306,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.25.4/arch/ia64/ia32/binfmt_elf32.c
linux-2.6.25.4/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.25.4/arch/ia64/ia32/binfmt_elf32.c 2008-05-15
11:00:12.000000000 -0400
-+++ linux-2.6.25.4/arch/ia64/ia32/binfmt_elf32.c 2008-06-04
08:52:09.000000000 -0400
+diff -urNp linux-2.6.25.7/arch/ia64/ia32/binfmt_elf32.c
linux-2.6.25.7/arch/ia64/ia32/binfmt_elf32.c
+--- linux-2.6.25.7/arch/ia64/ia32/binfmt_elf32.c 2008-05-15
11:00:12.000000000 -0400
++++ linux-2.6.25.7/arch/ia64/ia32/binfmt_elf32.c 2008-05-18
16:56:59.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))
@@ -413,9 +323,9 @@
/* Ugly but avoids duplication */
#include "../../../fs/binfmt_elf.c"
-diff -urNp linux-2.6.25.4/arch/ia64/ia32/ia32priv.h
linux-2.6.25.4/arch/ia64/ia32/ia32priv.h
---- linux-2.6.25.4/arch/ia64/ia32/ia32priv.h 2008-05-15 11:00:12.000000000
-0400
-+++ linux-2.6.25.4/arch/ia64/ia32/ia32priv.h 2008-06-04 08:52:09.000000000
-0400
+diff -urNp linux-2.6.25.7/arch/ia64/ia32/ia32priv.h
linux-2.6.25.7/arch/ia64/ia32/ia32priv.h
+--- linux-2.6.25.7/arch/ia64/ia32/ia32priv.h 2008-05-15 11:00:12.000000000
-0400
++++ linux-2.6.25.7/arch/ia64/ia32/ia32priv.h 2008-05-18 16:56:59.000000000
-0400
@@ -303,7 +303,14 @@ struct old_linux32_dirent {
#define ELF_DATA ELFDATA2LSB
#define ELF_ARCH EM_386
@@ -432,9 +342,9 @@
#define IA32_GATE_OFFSET IA32_PAGE_OFFSET
#define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE
-diff -urNp linux-2.6.25.4/arch/ia64/kernel/module.c
linux-2.6.25.4/arch/ia64/kernel/module.c
---- linux-2.6.25.4/arch/ia64/kernel/module.c 2008-05-15 11:00:12.000000000
-0400
-+++ linux-2.6.25.4/arch/ia64/kernel/module.c 2008-06-04 08:52:09.000000000
-0400
+diff -urNp linux-2.6.25.7/arch/ia64/kernel/module.c
linux-2.6.25.7/arch/ia64/kernel/module.c
+--- linux-2.6.25.7/arch/ia64/kernel/module.c 2008-05-15 11:00:12.000000000
-0400
++++ linux-2.6.25.7/arch/ia64/kernel/module.c 2008-05-18 16:56:59.000000000
-0400
@@ -321,7 +321,7 @@ module_alloc (unsigned long size)
void
module_free (struct module *mod, void *module_region)
@@ -522,9 +432,9 @@
mod->arch.gp = gp;
DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
}
-diff -urNp linux-2.6.25.4/arch/ia64/kernel/sys_ia64.c
linux-2.6.25.4/arch/ia64/kernel/sys_ia64.c
---- linux-2.6.25.4/arch/ia64/kernel/sys_ia64.c 2008-05-15 11:00:12.000000000
-0400
-+++ linux-2.6.25.4/arch/ia64/kernel/sys_ia64.c 2008-06-04 08:52:09.000000000
-0400
+diff -urNp linux-2.6.25.7/arch/ia64/kernel/sys_ia64.c
linux-2.6.25.7/arch/ia64/kernel/sys_ia64.c
+--- linux-2.6.25.7/arch/ia64/kernel/sys_ia64.c 2008-05-15 11:00:12.000000000
-0400
++++ linux-2.6.25.7/arch/ia64/kernel/sys_ia64.c 2008-05-18 16:56:59.000000000
-0400
@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
if (REGION_NUMBER(addr) == RGN_HPAGE)
addr = 0;
@@ -551,9 +461,9 @@
goto full_search;
}
return -ENOMEM;
-diff -urNp linux-2.6.25.4/arch/ia64/mm/fault.c
linux-2.6.25.4/arch/ia64/mm/fault.c
---- linux-2.6.25.4/arch/ia64/mm/fault.c 2008-05-15 11:00:12.000000000
-0400
-+++ linux-2.6.25.4/arch/ia64/mm/fault.c 2008-06-04 08:52:09.000000000
-0400
+diff -urNp linux-2.6.25.7/arch/ia64/mm/fault.c
linux-2.6.25.7/arch/ia64/mm/fault.c
+--- linux-2.6.25.7/arch/ia64/mm/fault.c 2008-05-15 11:00:12.000000000
-0400
++++ linux-2.6.25.7/arch/ia64/mm/fault.c 2008-05-18 16:56:59.000000000
-0400
@@ -10,6 +10,7 @@
#include <linux/interrupt.h>
#include <linux/kprobes.h>
@@ -611,19 +521,9 @@
survive:
/*
* If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.25.4/arch/ia64/mm/init.c
linux-2.6.25.4/arch/ia64/mm/init.c
---- linux-2.6.25.4/arch/ia64/mm/init.c 2008-05-15 11:00:12.000000000 -0400
-+++ linux-2.6.25.4/arch/ia64/mm/init.c 2008-06-04 08:52:09.000000000 -0400
-@@ -20,8 +20,8 @@
- #include <linux/proc_fs.h>
- #include <linux/bitops.h>
- #include <linux/kexec.h>
-+#include <linux/a.out.h>
-
--#include <asm/a.out.h>
- #include <asm/dma.h>
- #include <asm/ia32.h>
- #include <asm/io.h>
+diff -urNp linux-2.6.25.7/arch/ia64/mm/init.c
linux-2.6.25.7/arch/ia64/mm/init.c
+--- linux-2.6.25.7/arch/ia64/mm/init.c 2008-05-15 11:00:12.000000000 -0400
++++ linux-2.6.25.7/arch/ia64/mm/init.c 2008-05-18 18:28:23.000000000 -0400
@@ -128,6 +128,19 @@ ia64_init_addr_space (void)
vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -644,9 +544,9 @@
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
down_write(¤t->mm->mmap_sem);
if (insert_vm_struct(current->mm, vma)) {
-diff -urNp linux-2.6.25.4/arch/mips/kernel/binfmt_elfn32.c
linux-2.6.25.4/arch/mips/kernel/binfmt_elfn32.c
---- linux-2.6.25.4/arch/mips/kernel/binfmt_elfn32.c 2008-05-15
11:00:12.000000000 -0400
-+++ linux-2.6.25.4/arch/mips/kernel/binfmt_elfn32.c 2008-06-04
08:52:09.000000000 -0400
+diff -urNp linux-2.6.25.7/arch/mips/kernel/binfmt_elfn32.c
linux-2.6.25.7/arch/mips/kernel/binfmt_elfn32.c
+--- linux-2.6.25.7/arch/mips/kernel/binfmt_elfn32.c 2008-05-15
11:00:12.000000000 -0400
++++ linux-2.6.25.7/arch/mips/kernel/binfmt_elfn32.c 2008-05-18
16:56:59.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)
@@ -661,9 +561,9 @@
#include <asm/processor.h>
#include <linux/module.h>
#include <linux/elfcore.h>
-diff -urNp linux-2.6.25.4/arch/mips/kernel/binfmt_elfo32.c
linux-2.6.25.4/arch/mips/kernel/binfmt_elfo32.c
---- linux-2.6.25.4/arch/mips/kernel/binfmt_elfo32.c 2008-05-15
11:00:12.000000000 -0400
-+++ linux-2.6.25.4/arch/mips/kernel/binfmt_elfo32.c 2008-06-04
08:52:09.000000000 -0400
+diff -urNp linux-2.6.25.7/arch/mips/kernel/binfmt_elfo32.c
linux-2.6.25.7/arch/mips/kernel/binfmt_elfo32.c
+--- linux-2.6.25.7/arch/mips/kernel/binfmt_elfo32.c 2008-05-15
11:00:12.000000000 -0400
++++ linux-2.6.25.7/arch/mips/kernel/binfmt_elfo32.c 2008-05-18
16:56:59.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)
@@ -678,9 +578,9 @@
#include <asm/processor.h>
#include <linux/module.h>
#include <linux/elfcore.h>
-diff -urNp linux-2.6.25.4/arch/mips/kernel/syscall.c
linux-2.6.25.4/arch/mips/kernel/syscall.c
---- linux-2.6.25.4/arch/mips/kernel/syscall.c 2008-05-15 11:00:12.000000000
-0400
-+++ linux-2.6.25.4/arch/mips/kernel/syscall.c 2008-06-04 08:52:09.000000000
-0400
+diff -urNp linux-2.6.25.7/arch/mips/kernel/syscall.c
linux-2.6.25.7/arch/mips/kernel/syscall.c
+--- linux-2.6.25.7/arch/mips/kernel/syscall.c 2008-05-15 11:00:12.000000000
-0400
++++ linux-2.6.25.7/arch/mips/kernel/syscall.c 2008-05-18 16:56:59.000000000
-0400
@@ -93,6 +93,11 @@ unsigned long arch_get_unmapped_area(str
do_color_align = 0;
if (filp || (flags & MAP_SHARED))
@@ -702,9 +602,9 @@
if (do_color_align)
addr = COLOUR_ALIGN(addr, pgoff);
else
-diff -urNp linux-2.6.25.4/arch/mips/mm/fault.c
linux-2.6.25.4/arch/mips/mm/fault.c
---- linux-2.6.25.4/arch/mips/mm/fault.c 2008-05-15 11:00:12.000000000
-0400
-+++ linux-2.6.25.4/arch/mips/mm/fault.c 2008-06-04 08:52:09.000000000
-0400
+diff -urNp linux-2.6.25.7/arch/mips/mm/fault.c
linux-2.6.25.7/arch/mips/mm/fault.c
+--- linux-2.6.25.7/arch/mips/mm/fault.c 2008-05-15 11:00:12.000000000
-0400
++++ linux-2.6.25.7/arch/mips/mm/fault.c 2008-05-18 16:56:59.000000000
-0400
@@ -26,6 +26,23 @@
#include <asm/ptrace.h>
#include <asm/highmem.h> /* For VMALLOC_END */
@@ -729,9 +629,9 @@
/*
* This routine handles page faults. It determines the address,
* and the problem, and then passes it off to one of the appropriate
-diff -urNp linux-2.6.25.4/arch/parisc/kernel/module.c
linux-2.6.25.4/arch/parisc/kernel/module.c
---- linux-2.6.25.4/arch/parisc/kernel/module.c 2008-05-15 11:00:12.000000000
-0400
-+++ linux-2.6.25.4/arch/parisc/kernel/module.c 2008-06-04 08:52:09.000000000
-0400
+diff -urNp linux-2.6.25.7/arch/parisc/kernel/module.c
linux-2.6.25.7/arch/parisc/kernel/module.c
+--- linux-2.6.25.7/arch/parisc/kernel/module.c 2008-05-15 11:00:12.000000000
-0400
++++ linux-2.6.25.7/arch/parisc/kernel/module.c 2008-05-18 16:56:59.000000000
-0400
@@ -73,16 +73,38 @@
/* three functions to determine where in the module core
@@ -863,9 +763,9 @@
DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
me->arch.unwind_section, table, end, gp);
-diff -urNp linux-2.6.25.4/arch/parisc/kernel/sys_parisc.c
linux-2.6.25.4/arch/parisc/kernel/sys_parisc.c
---- linux-2.6.25.4/arch/parisc/kernel/sys_parisc.c 2008-05-15
11:00:12.000000000 -0400
-+++ linux-2.6.25.4/arch/parisc/kernel/sys_parisc.c 2008-06-04
08:52:09.000000000 -0400
+diff -urNp linux-2.6.25.7/arch/parisc/kernel/sys_parisc.c
linux-2.6.25.7/arch/parisc/kernel/sys_parisc.c
+--- linux-2.6.25.7/arch/parisc/kernel/sys_parisc.c 2008-05-15
11:00:12.000000000 -0400
++++ linux-2.6.25.7/arch/parisc/kernel/sys_parisc.c 2008-05-18
16:56:59.000000000 -0400
@@ -111,7 +111,7 @@ unsigned long arch_get_unmapped_area(str
if (flags & MAP_FIXED)
return addr;
@@ -875,9 +775,9 @@
if (filp) {
addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
-diff -urNp linux-2.6.25.4/arch/parisc/kernel/traps.c
linux-2.6.25.4/arch/parisc/kernel/traps.c
---- linux-2.6.25.4/arch/parisc/kernel/traps.c 2008-05-15 11:00:12.000000000
-0400
-+++ linux-2.6.25.4/arch/parisc/kernel/traps.c 2008-06-04 08:52:09.000000000
-0400
+diff -urNp linux-2.6.25.7/arch/parisc/kernel/traps.c
linux-2.6.25.7/arch/parisc/kernel/traps.c
+--- linux-2.6.25.7/arch/parisc/kernel/traps.c 2008-05-15 11:00:12.000000000
-0400
++++ linux-2.6.25.7/arch/parisc/kernel/traps.c 2008-05-18 16:56:59.000000000
-0400
@@ -732,9 +732,7 @@ void handle_interruption(int code, struc
down_read(¤t->mm->mmap_sem);
@@ -889,9 +789,9 @@
fault_address = regs->iaoq[0];
fault_space = regs->iasq[0];
-diff -urNp linux-2.6.25.4/arch/parisc/mm/fault.c
linux-2.6.25.4/arch/parisc/mm/fault.c
---- linux-2.6.25.4/arch/parisc/mm/fault.c 2008-05-15 11:00:12.000000000
-0400
-+++ linux-2.6.25.4/arch/parisc/mm/fault.c 2008-06-04 08:52:09.000000000
-0400
+diff -urNp linux-2.6.25.7/arch/parisc/mm/fault.c
linux-2.6.25.7/arch/parisc/mm/fault.c
+--- linux-2.6.25.7/arch/parisc/mm/fault.c 2008-05-15 11:00:12.000000000
-0400
++++ linux-2.6.25.7/arch/parisc/mm/fault.c 2008-05-18 16:56:59.000000000
-0400
@@ -16,6 +16,8 @@
#include <linux/sched.h>
#include <linux/interrupt.h>
@@ -1062,9 +962,9 @@
/*
* If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.25.4/arch/powerpc/kernel/module_32.c
linux-2.6.25.4/arch/powerpc/kernel/module_32.c
---- linux-2.6.25.4/arch/powerpc/kernel/module_32.c 2008-05-15
11:00:12.000000000 -0400
-+++ linux-2.6.25.4/arch/powerpc/kernel/module_32.c 2008-06-04
08:52:09.000000000 -0400
+diff -urNp linux-2.6.25.7/arch/powerpc/kernel/module_32.c
linux-2.6.25.7/arch/powerpc/kernel/module_32.c
+--- linux-2.6.25.7/arch/powerpc/kernel/module_32.c 2008-05-15
11:00:12.000000000 -0400
++++ linux-2.6.25.7/arch/powerpc/kernel/module_32.c 2008-05-18
16:56:59.000000000 -0400
@@ -175,7 +175,7 @@ int module_frob_arch_sections(Elf32_Ehdr
me->arch.core_plt_section = i;
}
@@ -1094,9 +994,9 @@
/* Find this entry, or if that fails, the next avail. entry */
while (entry->jump[0]) {
-diff -urNp linux-2.6.25.4/arch/powerpc/kernel/signal_32.c
linux-2.6.25.4/arch/powerpc/kernel/signal_32.c
---- linux-2.6.25.4/arch/powerpc/kernel/signal_32.c 2008-05-15
11:00:12.000000000 -0400
-+++ linux-2.6.25.4/arch/powerpc/kernel/signal_32.c 2008-06-04
08:52:09.000000000 -0400
+diff -urNp linux-2.6.25.7/arch/powerpc/kernel/signal_32.c
linux-2.6.25.7/arch/powerpc/kernel/signal_32.c
+--- linux-2.6.25.7/arch/powerpc/kernel/signal_32.c 2008-05-15
11:00:12.000000000 -0400
++++ linux-2.6.25.7/arch/powerpc/kernel/signal_32.c 2008-05-18
16:56:59.000000000 -0400
@@ -730,7 +730,7 @@ int handle_rt_signal32(unsigned long sig
/* Save user registers on the stack */
frame = &rt_sf->uc.uc_mcontext;
@@ -1106,9 +1006,9 @@
if (save_user_regs(regs, frame, 0))
goto badframe;
regs->link = current->mm->context.vdso_base +
vdso32_rt_sigtramp;
-diff -urNp linux-2.6.25.4/arch/powerpc/kernel/signal_64.c
linux-2.6.25.4/arch/powerpc/kernel/signal_64.c
---- linux-2.6.25.4/arch/powerpc/kernel/signal_64.c 2008-05-15
11:00:12.000000000 -0400
-+++ linux-2.6.25.4/arch/powerpc/kernel/signal_64.c 2008-06-04
08:52:09.000000000 -0400
+diff -urNp linux-2.6.25.7/arch/powerpc/kernel/signal_64.c
linux-2.6.25.7/arch/powerpc/kernel/signal_64.c
+--- linux-2.6.25.7/arch/powerpc/kernel/signal_64.c 2008-05-15
11:00:12.000000000 -0400
++++ linux-2.6.25.7/arch/powerpc/kernel/signal_64.c 2008-05-18
16:56:59.000000000 -0400
@@ -369,7 +369,7 @@ int handle_rt_signal64(int signr, struct
current->thread.fpscr.val = 0;
@@ -1118,9 +1018,9 @@
regs->link = current->mm->context.vdso_base +
vdso64_rt_sigtramp;
} else {
err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
-diff -urNp linux-2.6.25.4/arch/powerpc/kernel/vdso.c
linux-2.6.25.4/arch/powerpc/kernel/vdso.c
---- linux-2.6.25.4/arch/powerpc/kernel/vdso.c 2008-05-15 11:00:12.000000000
-0400
-+++ linux-2.6.25.4/arch/powerpc/kernel/vdso.c 2008-06-04 08:52:09.000000000
-0400
+diff -urNp linux-2.6.25.7/arch/powerpc/kernel/vdso.c
linux-2.6.25.7/arch/powerpc/kernel/vdso.c
+--- linux-2.6.25.7/arch/powerpc/kernel/vdso.c 2008-05-15 11:00:12.000000000
-0400
++++ linux-2.6.25.7/arch/powerpc/kernel/vdso.c 2008-05-18 16:57:00.000000000
-0400
@@ -211,7 +211,7 @@ int arch_setup_additional_pages(struct l
vdso_base = VDSO32_MBASE;
#endif
@@ -1139,9 +1039,9 @@
if (IS_ERR_VALUE(vdso_base)) {
rc = vdso_base;
goto fail_mmapsem;
-diff -urNp linux-2.6.25.4/arch/powerpc/mm/fault.c
linux-2.6.25.4/arch/powerpc/mm/fault.c
---- linux-2.6.25.4/arch/powerpc/mm/fault.c 2008-05-15 11:00:12.000000000
-0400
-+++ linux-2.6.25.4/arch/powerpc/mm/fault.c 2008-06-04 08:52:09.000000000
-0400
+diff -urNp linux-2.6.25.7/arch/powerpc/mm/fault.c
linux-2.6.25.7/arch/powerpc/mm/fault.c
+--- linux-2.6.25.7/arch/powerpc/mm/fault.c 2008-05-15 11:00:12.000000000
-0400
++++ linux-2.6.25.7/arch/powerpc/mm/fault.c 2008-05-18 16:57:00.000000000
-0400
@@ -29,6 +29,12 @@
#include <linux/module.h>
#include <linux/kprobes.h>
@@ -1569,9 +1469,9 @@
_exception(SIGSEGV, regs, code, address);
return 0;
}
-diff -urNp linux-2.6.25.4/arch/powerpc/mm/mmap.c
linux-2.6.25.4/arch/powerpc/mm/mmap.c
---- linux-2.6.25.4/arch/powerpc/mm/mmap.c 2008-05-15 11:00:12.000000000
-0400
-+++ linux-2.6.25.4/arch/powerpc/mm/mmap.c 2008-06-04 08:52:09.000000000
-0400
+diff -urNp linux-2.6.25.7/arch/powerpc/mm/mmap.c
linux-2.6.25.7/arch/powerpc/mm/mmap.c
+--- linux-2.6.25.7/arch/powerpc/mm/mmap.c 2008-05-15 11:00:12.000000000
-0400
++++ linux-2.6.25.7/arch/powerpc/mm/mmap.c 2008-05-18 16:57:00.000000000
-0400
@@ -75,10 +75,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
@@ -1595,9 +1495,9 @@
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-2.6.25.4/arch/ppc/mm/fault.c
linux-2.6.25.4/arch/ppc/mm/fault.c
---- linux-2.6.25.4/arch/ppc/mm/fault.c 2008-05-15 11:00:12.000000000 -0400
-+++ linux-2.6.25.4/arch/ppc/mm/fault.c 2008-06-04 08:52:09.000000000 -0400
+diff -urNp linux-2.6.25.7/arch/ppc/mm/fault.c
linux-2.6.25.7/arch/ppc/mm/fault.c
+--- linux-2.6.25.7/arch/ppc/mm/fault.c 2008-05-15 11:00:12.000000000 -0400
++++ linux-2.6.25.7/arch/ppc/mm/fault.c 2008-05-18 16:57:00.000000000 -0400
@@ -25,6 +25,11 @@
#include <linux/interrupt.h>
#include <linux/highmem.h>
@@ -2046,9 +1946,9 @@
_exception(SIGSEGV, regs, code, address);
return 0;
}
-diff -urNp linux-2.6.25.4/arch/s390/kernel/module.c
linux-2.6.25.4/arch/s390/kernel/module.c
---- linux-2.6.25.4/arch/s390/kernel/module.c 2008-05-15 11:00:12.000000000
-0400
-+++ linux-2.6.25.4/arch/s390/kernel/module.c 2008-06-04 08:52:09.000000000
-0400
+diff -urNp linux-2.6.25.7/arch/s390/kernel/module.c
linux-2.6.25.7/arch/s390/kernel/module.c
+--- linux-2.6.25.7/arch/s390/kernel/module.c 2008-05-15 11:00:12.000000000
-0400
++++ linux-2.6.25.7/arch/s390/kernel/module.c 2008-05-18 16:57:00.000000000
-0400
@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
/* Increase core size by size of got & plt and set start
@@ -2120,21 +2020,9 @@
rela->r_addend - loc;
if (r_type == R_390_GOTPC)
*(unsigned int *) loc = val;
-diff -urNp linux-2.6.25.4/arch/sparc/Makefile
linux-2.6.25.4/arch/sparc/Makefile
---- linux-2.6.25.4/arch/sparc/Makefile 2008-05-15 11:00:12.000000000 -0400
-+++ linux-2.6.25.4/arch/sparc/Makefile 2008-06-04 08:52:09.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))
- CORE_Y := $(core-y)
--CORE_Y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
-+CORE_Y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
grsecurity/
- CORE_Y := $(patsubst %/, %/built-in.o, $(CORE_Y))
- DRIVERS_Y := $(patsubst %/, %/built-in.o, $(drivers-y))
- NET_Y := $(patsubst %/, %/built-in.o, $(net-y))
-diff -urNp linux-2.6.25.4/arch/sparc/kernel/sys_sparc.c
linux-2.6.25.4/arch/sparc/kernel/sys_sparc.c
---- linux-2.6.25.4/arch/sparc/kernel/sys_sparc.c 2008-05-15
11:00:12.000000000 -0400
-+++ linux-2.6.25.4/arch/sparc/kernel/sys_sparc.c 2008-06-04
08:52:09.000000000 -0400
+diff -urNp linux-2.6.25.7/arch/sparc/kernel/sys_sparc.c
linux-2.6.25.7/arch/sparc/kernel/sys_sparc.c
+--- linux-2.6.25.7/arch/sparc/kernel/sys_sparc.c 2008-05-15
11:00:12.000000000 -0400
++++ linux-2.6.25.7/arch/sparc/kernel/sys_sparc.c 2008-05-18
16:57:00.000000000 -0400
@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
if (ARCH_SUN4C_SUN4 && len > 0x20000000)
return -ENOMEM;
@@ -2144,9 +2032,21 @@
if (flags & MAP_SHARED)
addr = COLOUR_ALIGN(addr);
-diff -urNp linux-2.6.25.4/arch/sparc/mm/fault.c
linux-2.6.25.4/arch/sparc/mm/fault.c
---- linux-2.6.25.4/arch/sparc/mm/fault.c 2008-05-15 11:00:12.000000000
-0400
-+++ linux-2.6.25.4/arch/sparc/mm/fault.c 2008-06-04 08:52:09.000000000
-0400
+diff -urNp linux-2.6.25.7/arch/sparc/Makefile
linux-2.6.25.7/arch/sparc/Makefile
+--- linux-2.6.25.7/arch/sparc/Makefile 2008-05-15 11:00:12.000000000 -0400
++++ linux-2.6.25.7/arch/sparc/Makefile 2008-05-18 16:57:00.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))
+ CORE_Y := $(core-y)
+-CORE_Y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
++CORE_Y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
grsecurity/
+ CORE_Y := $(patsubst %/, %/built-in.o, $(CORE_Y))
+ DRIVERS_Y := $(patsubst %/, %/built-in.o, $(drivers-y))
+ NET_Y := $(patsubst %/, %/built-in.o, $(net-y))
+diff -urNp linux-2.6.25.7/arch/sparc/mm/fault.c
linux-2.6.25.7/arch/sparc/mm/fault.c
+--- linux-2.6.25.7/arch/sparc/mm/fault.c 2008-05-15 11:00:12.000000000
-0400
++++ linux-2.6.25.7/arch/sparc/mm/fault.c 2008-05-18 16:57:00.000000000
-0400
@@ -21,6 +21,10 @@
#include <linux/interrupt.h>
#include <linux/module.h>
@@ -2437,9 +2337,9 @@
/* Allow reads even for write-only mappings */
if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
goto bad_area;
-diff -urNp linux-2.6.25.4/arch/sparc/mm/init.c
linux-2.6.25.4/arch/sparc/mm/init.c
---- linux-2.6.25.4/arch/sparc/mm/init.c 2008-05-15 11:00:12.000000000
-0400
-+++ linux-2.6.25.4/arch/sparc/mm/init.c 2008-06-04 08:52:09.000000000
-0400
+diff -urNp linux-2.6.25.7/arch/sparc/mm/init.c
linux-2.6.25.7/arch/sparc/mm/init.c
+--- linux-2.6.25.7/arch/sparc/mm/init.c 2008-05-15 11:00:12.000000000
-0400
++++ linux-2.6.25.7/arch/sparc/mm/init.c 2008-05-18 16:57:00.000000000
-0400
@@ -311,6 +311,9 @@ extern void device_scan(void);
pgprot_t PAGE_SHARED __read_mostly;
EXPORT_SYMBOL(PAGE_SHARED);
@@ -2474,9 +2374,9 @@
protection_map[12] = PAGE_READONLY;
protection_map[13] = PAGE_READONLY;
protection_map[14] = PAGE_SHARED;
-diff -urNp linux-2.6.25.4/arch/sparc/mm/srmmu.c
linux-2.6.25.4/arch/sparc/mm/srmmu.c
---- linux-2.6.25.4/arch/sparc/mm/srmmu.c 2008-05-15 11:00:12.000000000
-0400
-+++ linux-2.6.25.4/arch/sparc/mm/srmmu.c 2008-06-04 08:52:09.000000000
-0400
+diff -urNp linux-2.6.25.7/arch/sparc/mm/srmmu.c
linux-2.6.25.7/arch/sparc/mm/srmmu.c
+--- linux-2.6.25.7/arch/sparc/mm/srmmu.c 2008-05-15 11:00:12.000000000
-0400
++++ linux-2.6.25.7/arch/sparc/mm/srmmu.c 2008-05-18 16:57:00.000000000
-0400
@@ -2160,6 +2160,13 @@ void __init ld_mmu_srmmu(void)
PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -2491,9 +2391,9 @@
BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
-diff -urNp linux-2.6.25.4/arch/sparc64/kernel/Makefile
linux-2.6.25.4/arch/sparc64/kernel/Makefile
---- linux-2.6.25.4/arch/sparc64/kernel/Makefile 2008-05-15
11:00:12.000000000 -0400
-+++ linux-2.6.25.4/arch/sparc64/kernel/Makefile 2008-06-04
08:52:09.000000000 -0400
+diff -urNp linux-2.6.25.7/arch/sparc64/kernel/Makefile
linux-2.6.25.7/arch/sparc64/kernel/Makefile
+--- linux-2.6.25.7/arch/sparc64/kernel/Makefile 2008-05-15
11:00:12.000000000 -0400
++++ linux-2.6.25.7/arch/sparc64/kernel/Makefile 2008-05-18
16:57:00.000000000 -0400
@@ -3,7 +3,7 @@
#
@@ -2503,9 +2403,9 @@
extra-y := head.o init_task.o vmlinux.lds
-diff -urNp linux-2.6.25.4/arch/sparc64/kernel/sys_sparc.c
linux-2.6.25.4/arch/sparc64/kernel/sys_sparc.c
---- linux-2.6.25.4/arch/sparc64/kernel/sys_sparc.c 2008-05-15
11:00:12.000000000 -0400
-+++ linux-2.6.25.4/arch/sparc64/kernel/sys_sparc.c 2008-06-04
08:52:09.000000000 -0400
+diff -urNp linux-2.6.25.7/arch/sparc64/kernel/sys_sparc.c
linux-2.6.25.7/arch/sparc64/kernel/sys_sparc.c
+--- linux-2.6.25.7/arch/sparc64/kernel/sys_sparc.c 2008-05-15
11:00:12.000000000 -0400
++++ linux-2.6.25.7/arch/sparc64/kernel/sys_sparc.c 2008-05-18
16:57:00.000000000 -0400
@@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(str
/* We do not accept a shared mapping if it would violate
* cache aliasing constraints.
@@ -2584,21 +2484,9 @@
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-2.6.25.4/arch/sparc64/mm/Makefile
linux-2.6.25.4/arch/sparc64/mm/Makefile
---- linux-2.6.25.4/arch/sparc64/mm/Makefile 2008-05-15 11:00:12.000000000
-0400
-+++ linux-2.6.25.4/arch/sparc64/mm/Makefile 2008-06-04 08:52:09.000000000
-0400
-@@ -3,7 +3,7 @@
- #
-
- EXTRA_AFLAGS := -ansi
--EXTRA_CFLAGS := -Werror
-+#EXTRA_CFLAGS := -Werror
-
- obj-y := ultra.o tlb.o tsb.o fault.o init.o generic.o
-
-diff -urNp linux-2.6.25.4/arch/sparc64/mm/fault.c
linux-2.6.25.4/arch/sparc64/mm/fault.c
---- linux-2.6.25.4/arch/sparc64/mm/fault.c 2008-05-15 11:00:12.000000000
-0400
-+++ linux-2.6.25.4/arch/sparc64/mm/fault.c 2008-06-04 08:52:09.000000000
-0400
+diff -urNp linux-2.6.25.7/arch/sparc64/mm/fault.c
linux-2.6.25.7/arch/sparc64/mm/fault.c
+--- linux-2.6.25.7/arch/sparc64/mm/fault.c 2008-05-15 11:00:12.000000000
-0400
++++ linux-2.6.25.7/arch/sparc64/mm/fault.c 2008-05-18 16:57:00.000000000
-0400
@@ -20,6 +20,10 @@
#include <linux/kprobes.h>
#include <linux/kallsyms.h>
@@ -3023,9 +2911,21 @@
/* Pure DTLB misses do not tell us whether the fault causing
* load/store/atomic was a write or not, it only says that there
* was no match. So in such a case we (carefully) read the
<<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.17&r2=1.1.2.18&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
