diff options
Diffstat (limited to '3.3.1/4445_grsec-pax-without-grsec.patch')
| -rw-r--r-- | 3.3.1/4445_grsec-pax-without-grsec.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/3.3.1/4445_grsec-pax-without-grsec.patch b/3.3.1/4445_grsec-pax-without-grsec.patch index 58301c0..35255c2 100644 --- a/3.3.1/4445_grsec-pax-without-grsec.patch +++ b/3.3.1/4445_grsec-pax-without-grsec.patch @@ -1,7 +1,7 @@ -From: Anthony G. Basile <blueness@gentoo.org> +ny G. Basile <blueness@gentoo.org> With grsecurity-2.2.2-2.6.32.38-201104171745, the functions pax_report_leak_to_user and -pax_report_overflow_from_user in fs/exec.c were consolidated into pax_report_usercopy. +pax_report_om_user in fs/exec.c were consolidated into pax_report_usercopy. This patch has been updated to reflect that change. With grsecurity-2.9-2.6.32.58-201203131839, NORET_TYPE has been replaced by __noreturn. @@ -39,7 +39,7 @@ diff -Naur a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c diff -Naur a/fs/exec.c b/fs/exec.c --- a/fs/exec.c 2011-04-17 19:05:03.000000000 -0400 +++ b/fs/exec.c 2011-04-17 19:20:30.000000000 -0400 -@@ -2048,9 +2048,11 @@ +@@ -2052,9 +2052,11 @@ } up_read(&mm->mmap_sem); } @@ -51,7 +51,7 @@ diff -Naur a/fs/exec.c b/fs/exec.c printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset); printk(KERN_ERR "PAX: terminating task: %s(%s):%d, uid/euid: %u/%u, " "PC: %p, SP: %p\n", path_exec, tsk->comm, task_pid_nr(tsk), -@@ -2065,10 +2067,12 @@ +@@ -2069,10 +2071,12 @@ #ifdef CONFIG_PAX_REFCOUNT void pax_report_refcount_overflow(struct pt_regs *regs) { @@ -64,7 +64,7 @@ diff -Naur a/fs/exec.c b/fs/exec.c printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current), current_uid(), current_euid()); print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs)); -@@ -2127,10 +2131,12 @@ +@@ -2131,10 +2135,12 @@ __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type) { |