summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2012-04-09 09:34:00 -0400
committerAnthony G. Basile <blueness@gentoo.org>2012-04-09 09:34:00 -0400
commit33d9ea8ab4e59b5354557b11833732bcc6b5abbd (patch)
tree0c54b57ee69a262b62393c0176a6998e9b8232f0 /2.6.32/4455_grsec-kconfig-gentoo.patch
parentGrsec/PaX: 2.9-{2.6.32.59-201204010910,3.2.14-201204021757,3.3.1-201204021758} (diff)
downloadhardened-patchset-33d9ea8ab4e59b5354557b11833732bcc6b5abbd.tar.gz
hardened-patchset-33d9ea8ab4e59b5354557b11833732bcc6b5abbd.tar.bz2
hardened-patchset-33d9ea8ab4e59b5354557b11833732bcc6b5abbd.zip
Grsec/PaX: 2.9-{2.6.32.59,3.2.14,3.3.1}-20120406202020120406
Diffstat (limited to '2.6.32/4455_grsec-kconfig-gentoo.patch')
-rw-r--r--2.6.32/4455_grsec-kconfig-gentoo.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/2.6.32/4455_grsec-kconfig-gentoo.patch b/2.6.32/4455_grsec-kconfig-gentoo.patch
index 495638e..e578aa6 100644
--- a/2.6.32/4455_grsec-kconfig-gentoo.patch
+++ b/2.6.32/4455_grsec-kconfig-gentoo.patch
@@ -293,7 +293,7 @@ diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
diff -Naur a/security/Kconfig b/security/Kconfig
--- a/security/Kconfig 2011-12-26 12:23:44.000000000 -0500
+++ b/security/Kconfig 2011-12-26 11:14:27.000000000 -0500
-@@ -361,9 +361,10 @@
+@@ -360,9 +360,10 @@
config PAX_KERNEXEC
bool "Enforce non-executable kernel pages"
@@ -305,7 +305,7 @@ diff -Naur a/security/Kconfig b/security/Kconfig
help
This is the kernel land equivalent of PAGEEXEC and MPROTECT,
that is, enabling this option will make it harder to inject
-@@ -374,30 +375,30 @@
+@@ -373,30 +374,30 @@
choice
prompt "Return Address Instrumentation Method"
@@ -344,7 +344,7 @@ diff -Naur a/security/Kconfig b/security/Kconfig
default ""
config PAX_KERNEXEC_MODULE_TEXT
-@@ -554,8 +555,9 @@
+@@ -553,8 +554,9 @@
config PAX_MEMORY_UDEREF
bool "Prevent invalid userland pointer dereference"