packages: kernel/kernel-grsec_full.patch http://www.grsecurity.net/~spender...
arekm
arekm at pld-linux.org
Mon Mar 8 09:06:20 CET 2010
Author: arekm Date: Mon Mar 8 08:06:20 2010 GMT
Module: packages Tag: HEAD
---- Log message:
http://www.grsecurity.net/~spender/grsecurity-2.1.14-2.6.33-201003071645.patch
+ PLD adaptation. TODO:
6 out of 26 hunks FAILED -- saving rejects to file fs/proc/base.c.rej
1 out of 7 hunks FAILED -- saving rejects to file kernel/ptrace.c.rej
3 out of 6 hunks FAILED -- saving rejects to file mm/mlock.c.rej
3 out of 62 hunks FAILED -- saving rejects to file mm/mmap.c.rej
2 out of 2 hunks FAILED -- saving rejects to file security/commoncap.c.rej
---- Files affected:
packages/kernel:
kernel-grsec_full.patch (1.29 -> 1.30)
---- Diffs:
================================================================
Index: packages/kernel/kernel-grsec_full.patch
diff -u packages/kernel/kernel-grsec_full.patch:1.29 packages/kernel/kernel-grsec_full.patch:1.30
--- packages/kernel/kernel-grsec_full.patch:1.29 Tue Feb 23 20:11:25 2010
+++ packages/kernel/kernel-grsec_full.patch Mon Mar 8 09:06:13 2010
@@ -1,7 +1,7 @@
-diff -urNp linux-2.6.32.7/arch/alpha/include/asm/elf.h linux-2.6.32.7/arch/alpha/include/asm/elf.h
---- linux-2.6.32.7/arch/alpha/include/asm/elf.h 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/alpha/include/asm/elf.h 2010-01-25 17:39:40.226974977 -0500
-@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
+diff -urNp linux-2.6.33/arch/alpha/include/asm/elf.h linux-2.6.33/arch/alpha/include/asm/elf.h
+--- linux-2.6.33/arch/alpha/include/asm/elf.h 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/alpha/include/asm/elf.h 2010-03-07 12:23:35.885719847 -0500
+@@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
@@ -15,9 +15,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.32.7/arch/alpha/include/asm/pgtable.h linux-2.6.32.7/arch/alpha/include/asm/pgtable.h
---- linux-2.6.32.7/arch/alpha/include/asm/pgtable.h 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/alpha/include/asm/pgtable.h 2010-01-25 17:39:40.227409538 -0500
+diff -urNp linux-2.6.33/arch/alpha/include/asm/pgtable.h linux-2.6.33/arch/alpha/include/asm/pgtable.h
+--- linux-2.6.33/arch/alpha/include/asm/pgtable.h 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/alpha/include/asm/pgtable.h 2010-03-07 12:23:35.885719847 -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)
@@ -36,9 +36,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.32.7/arch/alpha/kernel/module.c linux-2.6.32.7/arch/alpha/kernel/module.c
---- linux-2.6.32.7/arch/alpha/kernel/module.c 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/alpha/kernel/module.c 2010-01-25 17:39:40.227409538 -0500
+diff -urNp linux-2.6.33/arch/alpha/kernel/module.c linux-2.6.33/arch/alpha/kernel/module.c
+--- linux-2.6.33/arch/alpha/kernel/module.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/alpha/kernel/module.c 2010-03-07 12:23:35.885719847 -0500
@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
/* The small sections were sorted to the end of the segment.
@@ -48,9 +48,9 @@
got = sechdrs[me->arch.gotsecindex].sh_addr;
for (i = 0; i < n; i++) {
-diff -urNp linux-2.6.32.7/arch/alpha/kernel/osf_sys.c linux-2.6.32.7/arch/alpha/kernel/osf_sys.c
---- linux-2.6.32.7/arch/alpha/kernel/osf_sys.c 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/alpha/kernel/osf_sys.c 2010-01-25 17:39:40.227409538 -0500
+diff -urNp linux-2.6.33/arch/alpha/kernel/osf_sys.c linux-2.6.33/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.33/arch/alpha/kernel/osf_sys.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/alpha/kernel/osf_sys.c 2010-03-07 12:23:35.885719847 -0500
@@ -1205,6 +1205,10 @@ arch_get_unmapped_area(struct file *filp
merely specific addresses, but regions of memory -- perhaps
this feature should be incorporated into all ports? */
@@ -73,9 +73,9 @@
if (addr != (unsigned long) -ENOMEM)
return addr;
-diff -urNp linux-2.6.32.7/arch/alpha/mm/fault.c linux-2.6.32.7/arch/alpha/mm/fault.c
---- linux-2.6.32.7/arch/alpha/mm/fault.c 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/alpha/mm/fault.c 2010-01-25 17:39:40.228183006 -0500
+diff -urNp linux-2.6.33/arch/alpha/mm/fault.c linux-2.6.33/arch/alpha/mm/fault.c
+--- linux-2.6.33/arch/alpha/mm/fault.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/alpha/mm/fault.c 2010-03-07 12:23:35.885719847 -0500
@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
__reload_thread(pcb);
}
@@ -232,10 +232,10 @@
} else if (!cause) {
/* Allow reads even for write-only mappings */
if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-2.6.32.7/arch/arm/include/asm/elf.h linux-2.6.32.7/arch/arm/include/asm/elf.h
---- linux-2.6.32.7/arch/arm/include/asm/elf.h 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/arm/include/asm/elf.h 2010-01-25 17:39:40.228183006 -0500
-@@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t
+diff -urNp linux-2.6.33/arch/arm/include/asm/elf.h linux-2.6.33/arch/arm/include/asm/elf.h
+--- linux-2.6.33/arch/arm/include/asm/elf.h 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/arm/include/asm/elf.h 2010-03-07 12:23:35.885719847 -0500
+@@ -108,7 +108,14 @@ int dump_task_regs(struct task_struct *t
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -251,9 +251,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.32.7/arch/arm/include/asm/kmap_types.h linux-2.6.32.7/arch/arm/include/asm/kmap_types.h
---- linux-2.6.32.7/arch/arm/include/asm/kmap_types.h 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/arm/include/asm/kmap_types.h 2010-01-25 17:39:40.228183006 -0500
+diff -urNp linux-2.6.33/arch/arm/include/asm/kmap_types.h linux-2.6.33/arch/arm/include/asm/kmap_types.h
+--- linux-2.6.33/arch/arm/include/asm/kmap_types.h 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/arm/include/asm/kmap_types.h 2010-03-07 12:23:35.885719847 -0500
@@ -19,6 +19,7 @@ enum km_type {
KM_SOFTIRQ0,
KM_SOFTIRQ1,
@@ -262,9 +262,9 @@
KM_TYPE_NR
};
-diff -urNp linux-2.6.32.7/arch/arm/include/asm/uaccess.h linux-2.6.32.7/arch/arm/include/asm/uaccess.h
---- linux-2.6.32.7/arch/arm/include/asm/uaccess.h 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/arm/include/asm/uaccess.h 2010-01-25 17:39:40.228183006 -0500
+diff -urNp linux-2.6.33/arch/arm/include/asm/uaccess.h linux-2.6.33/arch/arm/include/asm/uaccess.h
+--- linux-2.6.33/arch/arm/include/asm/uaccess.h 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/arm/include/asm/uaccess.h 2010-03-07 12:23:35.889620809 -0500
@@ -403,6 +403,9 @@ extern unsigned long __must_check __strn
static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
@@ -285,9 +285,9 @@
if (access_ok(VERIFY_WRITE, to, n))
n = __copy_to_user(to, from, n);
return n;
-diff -urNp linux-2.6.32.7/arch/arm/kernel/kgdb.c linux-2.6.32.7/arch/arm/kernel/kgdb.c
---- linux-2.6.32.7/arch/arm/kernel/kgdb.c 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/arm/kernel/kgdb.c 2010-01-25 17:39:40.228183006 -0500
+diff -urNp linux-2.6.33/arch/arm/kernel/kgdb.c linux-2.6.33/arch/arm/kernel/kgdb.c
+--- linux-2.6.33/arch/arm/kernel/kgdb.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/arm/kernel/kgdb.c 2010-03-07 12:23:35.889620809 -0500
@@ -190,7 +190,7 @@ void kgdb_arch_exit(void)
* and we handle the normal undef case within the do_undefinstr
* handler.
@@ -297,10 +297,10 @@
#ifndef __ARMEB__
.gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}
#else /* ! __ARMEB__ */
-diff -urNp linux-2.6.32.7/arch/arm/mach-at91/pm.c linux-2.6.32.7/arch/arm/mach-at91/pm.c
---- linux-2.6.32.7/arch/arm/mach-at91/pm.c 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/arm/mach-at91/pm.c 2010-01-25 17:39:40.228183006 -0500
-@@ -348,7 +348,7 @@ static void at91_pm_end(void)
+diff -urNp linux-2.6.33/arch/arm/mach-at91/pm.c linux-2.6.33/arch/arm/mach-at91/pm.c
+--- linux-2.6.33/arch/arm/mach-at91/pm.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/arm/mach-at91/pm.c 2010-03-07 12:23:35.889620809 -0500
+@@ -294,7 +294,7 @@ static void at91_pm_end(void)
}
@@ -309,9 +309,9 @@
.valid = at91_pm_valid_state,
.begin = at91_pm_begin,
.enter = at91_pm_enter,
-diff -urNp linux-2.6.32.7/arch/arm/mach-omap1/pm.c linux-2.6.32.7/arch/arm/mach-omap1/pm.c
---- linux-2.6.32.7/arch/arm/mach-omap1/pm.c 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/arm/mach-omap1/pm.c 2010-01-25 17:39:40.228183006 -0500
+diff -urNp linux-2.6.33/arch/arm/mach-omap1/pm.c linux-2.6.33/arch/arm/mach-omap1/pm.c
+--- linux-2.6.33/arch/arm/mach-omap1/pm.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/arm/mach-omap1/pm.c 2010-03-07 12:23:35.889620809 -0500
@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq
@@ -321,9 +321,9 @@
.prepare = omap_pm_prepare,
.enter = omap_pm_enter,
.finish = omap_pm_finish,
-diff -urNp linux-2.6.32.7/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.7/arch/arm/mach-omap2/pm24xx.c
---- linux-2.6.32.7/arch/arm/mach-omap2/pm24xx.c 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/arm/mach-omap2/pm24xx.c 2010-01-25 17:39:40.228183006 -0500
+diff -urNp linux-2.6.33/arch/arm/mach-omap2/pm24xx.c linux-2.6.33/arch/arm/mach-omap2/pm24xx.c
+--- linux-2.6.33/arch/arm/mach-omap2/pm24xx.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/arm/mach-omap2/pm24xx.c 2010-03-07 12:23:35.889620809 -0500
@@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
enable_hlt();
}
@@ -333,10 +333,10 @@
.prepare = omap2_pm_prepare,
.enter = omap2_pm_enter,
.finish = omap2_pm_finish,
-diff -urNp linux-2.6.32.7/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.7/arch/arm/mach-omap2/pm34xx.c
---- linux-2.6.32.7/arch/arm/mach-omap2/pm34xx.c 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/arm/mach-omap2/pm34xx.c 2010-01-25 17:39:40.229409370 -0500
-@@ -401,7 +401,7 @@ static void omap3_pm_end(void)
+diff -urNp linux-2.6.33/arch/arm/mach-omap2/pm34xx.c linux-2.6.33/arch/arm/mach-omap2/pm34xx.c
+--- linux-2.6.33/arch/arm/mach-omap2/pm34xx.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/arm/mach-omap2/pm34xx.c 2010-03-07 12:23:35.889620809 -0500
+@@ -650,7 +650,7 @@ static void omap3_pm_end(void)
return;
}
@@ -345,9 +345,9 @@
.begin = omap3_pm_begin,
.end = omap3_pm_end,
.prepare = omap3_pm_prepare,
-diff -urNp linux-2.6.32.7/arch/arm/mach-pnx4008/pm.c linux-2.6.32.7/arch/arm/mach-pnx4008/pm.c
---- linux-2.6.32.7/arch/arm/mach-pnx4008/pm.c 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/arm/mach-pnx4008/pm.c 2010-01-25 17:39:40.229409370 -0500
+diff -urNp linux-2.6.33/arch/arm/mach-pnx4008/pm.c linux-2.6.33/arch/arm/mach-pnx4008/pm.c
+--- linux-2.6.33/arch/arm/mach-pnx4008/pm.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/arm/mach-pnx4008/pm.c 2010-03-07 12:23:35.889620809 -0500
@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat
(state == PM_SUSPEND_MEM);
}
@@ -357,9 +357,9 @@
.enter = pnx4008_pm_enter,
.valid = pnx4008_pm_valid,
};
-diff -urNp linux-2.6.32.7/arch/arm/mach-pxa/pm.c linux-2.6.32.7/arch/arm/mach-pxa/pm.c
---- linux-2.6.32.7/arch/arm/mach-pxa/pm.c 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/arm/mach-pxa/pm.c 2010-01-25 17:39:40.229409370 -0500
+diff -urNp linux-2.6.33/arch/arm/mach-pxa/pm.c linux-2.6.33/arch/arm/mach-pxa/pm.c
+--- linux-2.6.33/arch/arm/mach-pxa/pm.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/arm/mach-pxa/pm.c 2010-03-07 12:23:35.889620809 -0500
@@ -95,7 +95,7 @@ void pxa_pm_finish(void)
pxa_cpu_pm_fns->finish();
}
@@ -369,10 +369,10 @@
.valid = pxa_pm_valid,
.enter = pxa_pm_enter,
.prepare = pxa_pm_prepare,
-diff -urNp linux-2.6.32.7/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.7/arch/arm/mach-pxa/sharpsl_pm.c
---- linux-2.6.32.7/arch/arm/mach-pxa/sharpsl_pm.c 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/arm/mach-pxa/sharpsl_pm.c 2010-01-25 17:39:40.230112049 -0500
-@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status
+diff -urNp linux-2.6.33/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.33/arch/arm/mach-pxa/sharpsl_pm.c
+--- linux-2.6.33/arch/arm/mach-pxa/sharpsl_pm.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-07 12:23:35.889620809 -0500
+@@ -892,7 +892,7 @@ static void sharpsl_apm_get_power_status
}
#ifdef CONFIG_PM
@@ -381,9 +381,9 @@
.prepare = pxa_pm_prepare,
.finish = pxa_pm_finish,
.enter = corgi_pxa_pm_enter,
-diff -urNp linux-2.6.32.7/arch/arm/mach-sa1100/pm.c linux-2.6.32.7/arch/arm/mach-sa1100/pm.c
---- linux-2.6.32.7/arch/arm/mach-sa1100/pm.c 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/arm/mach-sa1100/pm.c 2010-01-25 17:39:40.230112049 -0500
+diff -urNp linux-2.6.33/arch/arm/mach-sa1100/pm.c linux-2.6.33/arch/arm/mach-sa1100/pm.c
+--- linux-2.6.33/arch/arm/mach-sa1100/pm.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/arm/mach-sa1100/pm.c 2010-03-07 12:23:35.889620809 -0500
@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
return virt_to_phys(sp);
}
@@ -393,9 +393,60 @@
.enter = sa11x0_pm_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.32.7/arch/arm/mm/mmap.c linux-2.6.32.7/arch/arm/mm/mmap.c
---- linux-2.6.32.7/arch/arm/mm/mmap.c 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/arm/mm/mmap.c 2010-01-25 17:39:40.230112049 -0500
+diff -urNp linux-2.6.33/arch/arm/mm/fault.c linux-2.6.33/arch/arm/mm/fault.c
+--- linux-2.6.33/arch/arm/mm/fault.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/arm/mm/fault.c 2010-03-07 12:23:35.889620809 -0500
+@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk,
+ }
+ #endif
+
++#ifdef CONFIG_PAX_PAGEEXEC
++ if (fsr & FSR_LNX_PF) {
++ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
++ do_group_exit(SIGKILL);
++ }
++#endif
++
+ tsk->thread.address = addr;
+ tsk->thread.error_code = fsr;
+ tsk->thread.trap_no = 14;
+@@ -357,6 +364,33 @@ do_page_fault(unsigned long addr, unsign
+ }
+ #endif /* CONFIG_MMU */
+
++#ifdef CONFIG_PAX_PAGEEXEC
++void pax_report_insns(void *pc, void *sp)
++{
++ long i;
++
++ printk(KERN_ERR "PAX: bytes at PC: ");
++ for (i = 0; i < 20; i++) {
++ unsigned char c;
++ if (get_user(c, (__force unsigned char __user *)pc+i))
++ printk(KERN_CONT "?? ");
++ else
++ printk(KERN_CONT "%02x ", c);
++ }
++ printk("\n");
++
++ printk(KERN_ERR "PAX: bytes at SP-4: ");
++ for (i = -1; i < 20; i++) {
++ unsigned long c;
++ if (get_user(c, (__force unsigned long __user *)sp+i))
++ printk(KERN_CONT "???????? ");
++ else
++ printk(KERN_CONT "%08lx ", c);
++ }
++ printk("\n");
++}
++#endif
++
+ /*
+ * First Level Translation Fault Handler
+ *
+diff -urNp linux-2.6.33/arch/arm/mm/mmap.c linux-2.6.33/arch/arm/mm/mmap.c
+--- linux-2.6.33/arch/arm/mm/mmap.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/arm/mm/mmap.c 2010-03-07 12:23:35.889620809 -0500
@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
if (len > TASK_SIZE)
return -ENOMEM;
@@ -432,9 +483,9 @@
mm->cached_hole_size = 0;
goto full_search;
}
-diff -urNp linux-2.6.32.7/arch/arm/plat-s3c/pm.c linux-2.6.32.7/arch/arm/plat-s3c/pm.c
---- linux-2.6.32.7/arch/arm/plat-s3c/pm.c 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/arm/plat-s3c/pm.c 2010-01-25 17:39:40.241617700 -0500
+diff -urNp linux-2.6.33/arch/arm/plat-s3c/pm.c linux-2.6.33/arch/arm/plat-s3c/pm.c
+--- linux-2.6.33/arch/arm/plat-s3c/pm.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/arm/plat-s3c/pm.c 2010-03-07 12:23:35.889620809 -0500
@@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
s3c_pm_check_cleanup();
}
@@ -444,10 +495,10 @@
.enter = s3c_pm_enter,
.prepare = s3c_pm_prepare,
.finish = s3c_pm_finish,
-diff -urNp linux-2.6.32.7/arch/avr32/include/asm/elf.h linux-2.6.32.7/arch/avr32/include/asm/elf.h
---- linux-2.6.32.7/arch/avr32/include/asm/elf.h 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/avr32/include/asm/elf.h 2010-01-25 17:39:40.241617700 -0500
-@@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg
+diff -urNp linux-2.6.33/arch/avr32/include/asm/elf.h linux-2.6.33/arch/avr32/include/asm/elf.h
+--- linux-2.6.33/arch/avr32/include/asm/elf.h 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/avr32/include/asm/elf.h 2010-03-07 12:23:35.889620809 -0500
+@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpreg
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -463,9 +514,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.32.7/arch/avr32/include/asm/kmap_types.h linux-2.6.32.7/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.32.7/arch/avr32/include/asm/kmap_types.h 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/avr32/include/asm/kmap_types.h 2010-01-25 17:39:40.241617700 -0500
+diff -urNp linux-2.6.33/arch/avr32/include/asm/kmap_types.h linux-2.6.33/arch/avr32/include/asm/kmap_types.h
+--- linux-2.6.33/arch/avr32/include/asm/kmap_types.h 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/avr32/include/asm/kmap_types.h 2010-03-07 12:23:35.889620809 -0500
@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
D(11) KM_IRQ1,
D(12) KM_SOFTIRQ0,
@@ -476,9 +527,9 @@
};
#undef D
-diff -urNp linux-2.6.32.7/arch/avr32/mach-at32ap/pm.c linux-2.6.32.7/arch/avr32/mach-at32ap/pm.c
---- linux-2.6.32.7/arch/avr32/mach-at32ap/pm.c 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/avr32/mach-at32ap/pm.c 2010-01-25 17:39:40.241617700 -0500
+diff -urNp linux-2.6.33/arch/avr32/mach-at32ap/pm.c linux-2.6.33/arch/avr32/mach-at32ap/pm.c
+--- linux-2.6.33/arch/avr32/mach-at32ap/pm.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/avr32/mach-at32ap/pm.c 2010-03-07 12:23:35.889620809 -0500
@@ -176,7 +176,7 @@ out:
return 0;
}
@@ -488,9 +539,9 @@
.valid = avr32_pm_valid_state,
.enter = avr32_pm_enter,
};
-diff -urNp linux-2.6.32.7/arch/avr32/mm/fault.c linux-2.6.32.7/arch/avr32/mm/fault.c
---- linux-2.6.32.7/arch/avr32/mm/fault.c 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/avr32/mm/fault.c 2010-01-25 17:39:40.241617700 -0500
+diff -urNp linux-2.6.33/arch/avr32/mm/fault.c linux-2.6.33/arch/avr32/mm/fault.c
+--- linux-2.6.33/arch/avr32/mm/fault.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/avr32/mm/fault.c 2010-03-07 12:23:35.889620809 -0500
@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
int exception_trace = 1;
@@ -532,10 +583,10 @@
if (exception_trace && printk_ratelimit())
printk("%s%s[%d]: segfault at %08lx pc %08lx "
"sp %08lx ecr %lu\n",
-diff -urNp linux-2.6.32.7/arch/blackfin/kernel/kgdb.c linux-2.6.32.7/arch/blackfin/kernel/kgdb.c
---- linux-2.6.32.7/arch/blackfin/kernel/kgdb.c 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/blackfin/kernel/kgdb.c 2010-01-25 17:39:40.242404070 -0500
-@@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto
+diff -urNp linux-2.6.33/arch/blackfin/kernel/kgdb.c linux-2.6.33/arch/blackfin/kernel/kgdb.c
+--- linux-2.6.33/arch/blackfin/kernel/kgdb.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/blackfin/kernel/kgdb.c 2010-03-07 12:23:35.889620809 -0500
+@@ -397,7 +397,7 @@ int kgdb_arch_handle_exception(int vecto
return -1; /* this means that we do not want to exit from the handler */
}
@@ -544,9 +595,9 @@
.gdb_bpt_instr = {0xa1},
#ifdef CONFIG_SMP
.flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
-diff -urNp linux-2.6.32.7/arch/blackfin/mach-common/pm.c linux-2.6.32.7/arch/blackfin/mach-common/pm.c
---- linux-2.6.32.7/arch/blackfin/mach-common/pm.c 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/blackfin/mach-common/pm.c 2010-01-25 17:39:40.254403041 -0500
+diff -urNp linux-2.6.33/arch/blackfin/mach-common/pm.c linux-2.6.33/arch/blackfin/mach-common/pm.c
+--- linux-2.6.33/arch/blackfin/mach-common/pm.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/blackfin/mach-common/pm.c 2010-03-07 12:23:35.889620809 -0500
@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t
return 0;
}
@@ -556,9 +607,30 @@
.enter = bfin_pm_enter,
.valid = bfin_pm_valid,
};
-diff -urNp linux-2.6.32.7/arch/frv/include/asm/kmap_types.h linux-2.6.32.7/arch/frv/include/asm/kmap_types.h
---- linux-2.6.32.7/arch/frv/include/asm/kmap_types.h 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/frv/include/asm/kmap_types.h 2010-01-25 17:39:40.254403041 -0500
+diff -urNp linux-2.6.33/arch/blackfin/mm/maccess.c linux-2.6.33/arch/blackfin/mm/maccess.c
+--- linux-2.6.33/arch/blackfin/mm/maccess.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/blackfin/mm/maccess.c 2010-03-07 12:23:35.889620809 -0500
+@@ -16,7 +16,7 @@ static int validate_memory_access_addres
+ return bfin_mem_access_type(addr, size);
+ }
+
+-long probe_kernel_read(void *dst, void *src, size_t size)
++long probe_kernel_read(void *dst, const void *src, size_t size)
+ {
+ unsigned long lsrc = (unsigned long)src;
+ int mem_type;
+@@ -55,7 +55,7 @@ long probe_kernel_read(void *dst, void *
+ return -EFAULT;
+ }
+
+-long probe_kernel_write(void *dst, void *src, size_t size)
++long probe_kernel_write(void *dst, const void *src, size_t size)
+ {
+ unsigned long ldst = (unsigned long)dst;
+ int mem_type;
+diff -urNp linux-2.6.33/arch/frv/include/asm/kmap_types.h linux-2.6.33/arch/frv/include/asm/kmap_types.h
+--- linux-2.6.33/arch/frv/include/asm/kmap_types.h 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/frv/include/asm/kmap_types.h 2010-03-07 12:23:35.889620809 -0500
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
@@ -567,9 +639,9 @@
KM_TYPE_NR
};
-diff -urNp linux-2.6.32.7/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.7/arch/ia64/hp/common/hwsw_iommu.c
---- linux-2.6.32.7/arch/ia64/hp/common/hwsw_iommu.c 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/ia64/hp/common/hwsw_iommu.c 2010-01-25 17:39:40.254403041 -0500
+diff -urNp linux-2.6.33/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.33/arch/ia64/hp/common/hwsw_iommu.c
+--- linux-2.6.33/arch/ia64/hp/common/hwsw_iommu.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/ia64/hp/common/hwsw_iommu.c 2010-03-07 12:23:35.889620809 -0500
@@ -17,7 +17,7 @@
#include <linux/swiotlb.h>
#include <asm/machvec.h>
@@ -588,10 +660,10 @@
{
if (use_swiotlb(dev))
return &swiotlb_dma_ops;
-diff -urNp linux-2.6.32.7/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.7/arch/ia64/hp/common/sba_iommu.c
---- linux-2.6.32.7/arch/ia64/hp/common/sba_iommu.c 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/ia64/hp/common/sba_iommu.c 2010-01-25 17:39:40.255155838 -0500
-@@ -2077,7 +2077,7 @@ static struct acpi_driver acpi_sba_ioc_d
+diff -urNp linux-2.6.33/arch/ia64/hp/common/sba_iommu.c linux-2.6.33/arch/ia64/hp/common/sba_iommu.c
+--- linux-2.6.33/arch/ia64/hp/common/sba_iommu.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/ia64/hp/common/sba_iommu.c 2010-03-07 12:23:35.889620809 -0500
+@@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d
},
};
@@ -600,7 +672,7 @@
static int __init
sba_init(void)
-@@ -2191,7 +2191,7 @@ sba_page_override(char *str)
+@@ -2211,7 +2211,7 @@ sba_page_override(char *str)
__setup("sbapagesize=",sba_page_override);
@@ -609,9 +681,9 @@
.alloc_coherent = sba_alloc_coherent,
.free_coherent = sba_free_coherent,
.map_page = sba_map_page,
-diff -urNp linux-2.6.32.7/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.7/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.32.7/arch/ia64/ia32/binfmt_elf32.c 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/ia64/ia32/binfmt_elf32.c 2010-01-25 17:39:40.255155838 -0500
+diff -urNp linux-2.6.33/arch/ia64/ia32/binfmt_elf32.c linux-2.6.33/arch/ia64/ia32/binfmt_elf32.c
+--- linux-2.6.33/arch/ia64/ia32/binfmt_elf32.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/ia64/ia32/binfmt_elf32.c 2010-03-07 12:23:35.889620809 -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))
@@ -626,9 +698,9 @@
/* Ugly but avoids duplication */
#include "../../../fs/binfmt_elf.c"
-diff -urNp linux-2.6.32.7/arch/ia64/ia32/ia32priv.h linux-2.6.32.7/arch/ia64/ia32/ia32priv.h
---- linux-2.6.32.7/arch/ia64/ia32/ia32priv.h 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/ia64/ia32/ia32priv.h 2010-01-25 17:39:40.255155838 -0500
+diff -urNp linux-2.6.33/arch/ia64/ia32/ia32priv.h linux-2.6.33/arch/ia64/ia32/ia32priv.h
+--- linux-2.6.33/arch/ia64/ia32/ia32priv.h 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/ia64/ia32/ia32priv.h 2010-03-07 12:23:35.889620809 -0500
@@ -296,7 +296,14 @@ typedef struct compat_siginfo {
#define ELF_DATA ELFDATA2LSB
#define ELF_ARCH EM_386
@@ -645,9 +717,9 @@
#define IA32_GATE_OFFSET IA32_PAGE_OFFSET
#define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE
-diff -urNp linux-2.6.32.7/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.7/arch/ia64/include/asm/dma-mapping.h
---- linux-2.6.32.7/arch/ia64/include/asm/dma-mapping.h 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/ia64/include/asm/dma-mapping.h 2010-01-25 17:39:40.255155838 -0500
+diff -urNp linux-2.6.33/arch/ia64/include/asm/dma-mapping.h linux-2.6.33/arch/ia64/include/asm/dma-mapping.h
+--- linux-2.6.33/arch/ia64/include/asm/dma-mapping.h 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/ia64/include/asm/dma-mapping.h 2010-03-07 12:23:35.889620809 -0500
@@ -12,7 +12,7 @@
#define ARCH_HAS_DMA_GET_REQUIRED_MASK
@@ -691,10 +763,10 @@
return ops->dma_supported(dev, mask);
}
-diff -urNp linux-2.6.32.7/arch/ia64/include/asm/elf.h linux-2.6.32.7/arch/ia64/include/asm/elf.h
---- linux-2.6.32.7/arch/ia64/include/asm/elf.h 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/ia64/include/asm/elf.h 2010-01-25 17:39:40.255155838 -0500
-@@ -43,6 +43,13 @@
+diff -urNp linux-2.6.33/arch/ia64/include/asm/elf.h linux-2.6.33/arch/ia64/include/asm/elf.h
+--- linux-2.6.33/arch/ia64/include/asm/elf.h 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/ia64/include/asm/elf.h 2010-03-07 12:23:35.889620809 -0500
+@@ -42,6 +42,13 @@
*/
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -708,9 +780,9 @@
#define PT_IA_64_UNWIND 0x70000001
/* IA-64 relocations: */
-diff -urNp linux-2.6.32.7/arch/ia64/include/asm/machvec.h linux-2.6.32.7/arch/ia64/include/asm/machvec.h
---- linux-2.6.32.7/arch/ia64/include/asm/machvec.h 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/ia64/include/asm/machvec.h 2010-01-25 17:39:40.255155838 -0500
+diff -urNp linux-2.6.33/arch/ia64/include/asm/machvec.h linux-2.6.33/arch/ia64/include/asm/machvec.h
+--- linux-2.6.33/arch/ia64/include/asm/machvec.h 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/ia64/include/asm/machvec.h 2010-03-07 12:23:35.889620809 -0500
@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
/* DMA-mapping interface: */
typedef void ia64_mv_dma_init (void);
@@ -729,9 +801,9 @@
/*
* Define default versions so we can extend machvec for new platforms without having
-diff -urNp linux-2.6.32.7/arch/ia64/include/asm/pgtable.h linux-2.6.32.7/arch/ia64/include/asm/pgtable.h
---- linux-2.6.32.7/arch/ia64/include/asm/pgtable.h 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/ia64/include/asm/pgtable.h 2010-01-25 17:39:40.256405587 -0500
+diff -urNp linux-2.6.33/arch/ia64/include/asm/pgtable.h linux-2.6.33/arch/ia64/include/asm/pgtable.h
+--- linux-2.6.33/arch/ia64/include/asm/pgtable.h 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/ia64/include/asm/pgtable.h 2010-03-07 12:23:35.889620809 -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)
@@ -750,9 +822,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.32.7/arch/ia64/include/asm/uaccess.h linux-2.6.32.7/arch/ia64/include/asm/uaccess.h
---- linux-2.6.32.7/arch/ia64/include/asm/uaccess.h 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/ia64/include/asm/uaccess.h 2010-01-25 17:39:40.256405587 -0500
+diff -urNp linux-2.6.33/arch/ia64/include/asm/uaccess.h linux-2.6.33/arch/ia64/include/asm/uaccess.h
+--- linux-2.6.33/arch/ia64/include/asm/uaccess.h 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/ia64/include/asm/uaccess.h 2010-03-07 12:23:35.889620809 -0500
@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
const void *__cu_from = (from); \
long __cu_len = (n); \
@@ -771,9 +843,9 @@
__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
__cu_len; \
})
-diff -urNp linux-2.6.32.7/arch/ia64/kernel/dma-mapping.c linux-2.6.32.7/arch/ia64/kernel/dma-mapping.c
---- linux-2.6.32.7/arch/ia64/kernel/dma-mapping.c 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/ia64/kernel/dma-mapping.c 2010-01-25 17:39:40.256405587 -0500
+diff -urNp linux-2.6.33/arch/ia64/kernel/dma-mapping.c linux-2.6.33/arch/ia64/kernel/dma-mapping.c
+--- linux-2.6.33/arch/ia64/kernel/dma-mapping.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/ia64/kernel/dma-mapping.c 2010-03-07 12:23:35.889620809 -0500
@@ -3,7 +3,7 @@
/* Set this to 1 if there is a HW IOMMU in the system */
int iommu_detected __read_mostly;
@@ -792,9 +864,9 @@
{
return dma_ops;
}
-diff -urNp linux-2.6.32.7/arch/ia64/kernel/module.c linux-2.6.32.7/arch/ia64/kernel/module.c
---- linux-2.6.32.7/arch/ia64/kernel/module.c 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/ia64/kernel/module.c 2010-01-25 17:39:40.256405587 -0500
+diff -urNp linux-2.6.33/arch/ia64/kernel/module.c linux-2.6.33/arch/ia64/kernel/module.c
+--- linux-2.6.33/arch/ia64/kernel/module.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/ia64/kernel/module.c 2010-03-07 12:23:35.895205004 -0500
@@ -315,8 +315,7 @@ module_alloc (unsigned long size)
void
module_free (struct module *mod, void *module_region)
@@ -883,9 +955,9 @@
mod->arch.gp = gp;
DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
}
-diff -urNp linux-2.6.32.7/arch/ia64/kernel/pci-dma.c linux-2.6.32.7/arch/ia64/kernel/pci-dma.c
---- linux-2.6.32.7/arch/ia64/kernel/pci-dma.c 2010-01-25 13:50:10.000000000 -0500
-+++ linux-2.6.32.7/arch/ia64/kernel/pci-dma.c 2010-01-25 17:39:40.256405587 -0500
+diff -urNp linux-2.6.33/arch/ia64/kernel/pci-dma.c linux-2.6.33/arch/ia64/kernel/pci-dma.c
+--- linux-2.6.33/arch/ia64/kernel/pci-dma.c 2010-02-24 13:52:17.000000000 -0500
++++ linux-2.6.33/arch/ia64/kernel/pci-dma.c 2010-03-07 12:23:35.895205004 -0500
@@ -43,7 +43,7 @@ struct device fallback_dev = {
.dma_mask = &fallback_dev.coherent_dma_mask,
};
@@ -895,9 +967,9 @@
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_full.patch?r1=1.29&r2=1.30&f=u
More information about the pld-cvs-commit
mailing list