summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <basile@opensource.dyc.edu>2010-10-04 06:59:13 -0400
committerAnthony G. Basile <basile@opensource.dyc.edu>2010-10-04 06:59:13 -0400
commitb2f242caf824e0a54e0e184142fa2f846231e73a (patch)
tree58a8eb343b42718c60a62888a30a19d7c16ef43b /2.6.32/4425_grsec-pax-without-grsec.patch
parentDropping support for 2.6.34 (diff)
downloadhardened-patchset-b2f242caf824e0a54e0e184142fa2f846231e73a.tar.gz
hardened-patchset-b2f242caf824e0a54e0e184142fa2f846231e73a.tar.bz2
hardened-patchset-b2f242caf824e0a54e0e184142fa2f846231e73a.zip
Updated Grsec/PaX20101002
2.2.0-2.6.32.24-201010021153 for 2.6.32.23 2.2.0-2.6.35.7-201010021153 for 2.6.35.6
Diffstat (limited to '2.6.32/4425_grsec-pax-without-grsec.patch')
-rw-r--r--2.6.32/4425_grsec-pax-without-grsec.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/2.6.32/4425_grsec-pax-without-grsec.patch b/2.6.32/4425_grsec-pax-without-grsec.patch
index 2abeeef..438148a 100644
--- a/2.6.32/4425_grsec-pax-without-grsec.patch
+++ b/2.6.32/4425_grsec-pax-without-grsec.patch
@@ -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));
-@@ -1847,10 +1851,12 @@
+@@ -1839,10 +1843,12 @@
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);
-@@ -1858,10 +1864,12 @@
+@@ -1850,10 +1856,12 @@
void pax_report_overflow_from_user(const void *ptr, unsigned long len)
{