summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2014-04-12 18:06:49 -0400
committerAnthony G. Basile <blueness@gentoo.org>2014-04-12 18:06:49 -0400
commitbbedbd01cc88971589882e76d65e8c5cd5c87e98 (patch)
treef612d0ecfe7ec0418db211b0f3fead6c0fcf7b75
parentGrsec/PaX: 3.0-{3.2.57,3.13.9}-201404111812 (diff)
downloadhardened-patchset-bbedbd01cc88971589882e76d65e8c5cd5c87e98.tar.gz
hardened-patchset-bbedbd01cc88971589882e76d65e8c5cd5c87e98.tar.bz2
hardened-patchset-bbedbd01cc88971589882e76d65e8c5cd5c87e98.zip
3.13.9: reintroduce 4425_grsec_remove_EI_PAX.patch20140411
-rw-r--r--3.13.9/0000_README4
-rw-r--r--3.13.9/4425_grsec_remove_EI_PAX.patch19
2 files changed, 23 insertions, 0 deletions
diff --git a/3.13.9/0000_README b/3.13.9/0000_README
index 97a73be..02b8064 100644
--- a/3.13.9/0000_README
+++ b/3.13.9/0000_README
@@ -6,6 +6,10 @@ Patch: 4420_grsecurity-3.0-3.13.9-201404062127.patch
From: http://www.grsecurity.net
Desc: hardened-sources base patch from upstream grsecurity
+Patch: 4425_grsec_remove_EI_PAX.patch
+From: Anthony G. Basile <blueness@gentoo.org>
+Desc: Remove EI_PAX option and force off
+
Patch: 4430_grsec-remove-localversion-grsec.patch
From: Kerin Millar <kerframil@gmail.com>
Desc: Removes grsecurity's localversion-grsec file
diff --git a/3.13.9/4425_grsec_remove_EI_PAX.patch b/3.13.9/4425_grsec_remove_EI_PAX.patch
new file mode 100644
index 0000000..cf65d90
--- /dev/null
+++ b/3.13.9/4425_grsec_remove_EI_PAX.patch
@@ -0,0 +1,19 @@
+From: Anthony G. Basile <blueness@gentoo.org>
+
+Deprecate EI_PAX.
+
+X-Gentoo-Bug: 445600
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/445600
+
+diff -Nuar linux-3.7.1-hardened.orig/security/Kconfig linux-3.7.1-hardened/security/Kconfig
+--- linux-3.7.1-hardened.orig/security/Kconfig 2012-12-26 08:39:29.000000000 -0500
++++ linux-3.7.1-hardened/security/Kconfig 2012-12-26 09:05:44.000000000 -0500
+@@ -267,7 +267,7 @@
+
+ config PAX_EI_PAX
+ bool 'Use legacy ELF header marking'
+- default y if GRKERNSEC_CONFIG_AUTO
++ depends on BROKEN
+ help
+ Enabling this option will allow you to control PaX features on
+ a per executable basis via the 'chpax' utility available at