diff options
Diffstat (limited to 'kernel/2.6.33/4425_grsec-pax-without-grsec.patch')
| -rw-r--r-- | kernel/2.6.33/4425_grsec-pax-without-grsec.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/2.6.33/4425_grsec-pax-without-grsec.patch b/kernel/2.6.33/4425_grsec-pax-without-grsec.patch index 6d987b9..9a50663 100644 --- a/kernel/2.6.33/4425_grsec-pax-without-grsec.patch +++ b/kernel/2.6.33/4425_grsec-pax-without-grsec.patch @@ -13,7 +13,7 @@ The original version of this patch contained no credits/description. --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c -@@ -610,10 +610,12 @@ +@@ -635,10 +635,12 @@ #ifdef CONFIG_PAX_KERNEXEC if (init_mm.start_code <= address && address < init_mm.end_code) { @@ -28,7 +28,7 @@ The original version of this patch contained no credits/description. } --- a/fs/exec.c +++ b/fs/exec.c -@@ -1730,9 +1730,11 @@ +@@ -1759,9 +1759,11 @@ } up_read(&mm->mmap_sem); } @@ -40,7 +40,7 @@ The original version of this patch contained no credits/description. 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), -@@ -1747,10 +1749,12 @@ +@@ -1776,10 +1778,12 @@ #ifdef CONFIG_PAX_REFCOUNT void pax_report_refcount_overflow(struct pt_regs *regs) { @@ -53,7 +53,7 @@ The original version of this patch contained no credits/description. 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)); -@@ -1762,10 +1766,12 @@ +@@ -1791,10 +1795,12 @@ #ifdef CONFIG_PAX_USERCOPY void pax_report_leak_to_user(const void *ptr, unsigned long len) { @@ -66,7 +66,7 @@ The original version of this patch contained no credits/description. printk(KERN_ERR "PAX: kernel memory leak attempt detected from %p (%lu bytes)\n", ptr, len); dump_stack(); do_group_exit(SIGKILL); -@@ -1773,10 +1779,12 @@ +@@ -1802,10 +1808,12 @@ void pax_report_overflow_from_user(const void *ptr, unsigned long len) { @@ -81,7 +81,7 @@ The original version of this patch contained no credits/description. do_group_exit(SIGKILL); --- a/security/Kconfig +++ b/security/Kconfig -@@ -10,7 +10,7 @@ menu "PaX" +@@ -19,7 +19,7 @@ menu "PaX" config PAX bool "Enable various PaX features" |