summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2012-04-26 23:52:48 -0400
committerMatthew Thode <prometheanfire@gentoo.org>2012-04-26 23:52:48 -0400
commit90e6c06fd6e6d9d72616afee06b8f53b9eeab2d1 (patch)
tree1c17ad8fd55bc605eb43151c57a48f83484ecffe
parentredo the patch (diff)
downloadhardened-patchset-90e6c06fd6e6d9d72616afee06b8f53b9eeab2d1.tar.gz
hardened-patchset-90e6c06fd6e6d9d72616afee06b8f53b9eeab2d1.tar.bz2
hardened-patchset-90e6c06fd6e6d9d72616afee06b8f53b9eeab2d1.zip
fixed CONFIG_PAX_MEMORY_STACKLEAK issue in xenserver guests, needed to
be disabled in order to boot or the dom0 would complain about an incompatible kernel
-rw-r--r--3.3.3/4455_grsec-kconfig-gentoo.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/3.3.3/4455_grsec-kconfig-gentoo.patch b/3.3.3/4455_grsec-kconfig-gentoo.patch
index 79f97da..b9dc3e5 100644
--- a/3.3.3/4455_grsec-kconfig-gentoo.patch
+++ b/3.3.3/4455_grsec-kconfig-gentoo.patch
@@ -95,7 +95,7 @@ diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
+ select PAX_REFCOUNT if (X86 || SPARC64)
+ select PAX_USERCOPY if ((X86 || PPC || SPARC || ARM) && (SLAB || SLUB || SLOB))
+ select PAX_MEMORY_SANITIZE
-+ select PAX_MEMORY_STACKLEAK
++ select PAX_MEMORY_STACKLEAK if (!XEN)
+ help
+ If you say Y here, a configuration for grsecurity/PaX features
+ will be used that is endorsed by the Hardened Gentoo project.
@@ -180,7 +180,7 @@ diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
+ select PAX_REFCOUNT if (X86 || SPARC64)
+ select PAX_USERCOPY if ((X86 || PPC || SPARC || ARM) && (SLAB || SLUB || SLOB))
+ select PAX_MEMORY_SANITIZE
-+ select PAX_MEMORY_STACKLEAK
++ select PAX_MEMORY_STACKLEAK if (!XEN)
+ help
+ If you say Y here, a configuration for grsecurity/PaX features
+ will be used that is endorsed by the Hardened Gentoo project.
@@ -263,7 +263,7 @@ diff -Naur a/grsecurity/Kconfig b/grsecurity/Kconfig
+ select PAX_REFCOUNT if (X86 || SPARC64)
+ select PAX_USERCOPY if ((X86 || PPC || SPARC || ARM) && (SLAB || SLUB || SLOB))
+ select PAX_MEMORY_SANITIZE
-+ select PAX_MEMORY_STACKLEAK
++ select PAX_MEMORY_STACKLEAK if (!XEN)
+ help
+ If you say Y here, a configuration for grsecurity/PaX features
+ will be used that is endorsed by the Hardened Gentoo project.