summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory A. Pratt <anarchy@gentoo.org>2010-03-07 18:21:02 -0600
committerJory A. Pratt <anarchy@gentoo.org>2010-03-07 18:21:02 -0600
commit705532ed7e36941a726b0fe668ce7efe9d11cc1f (patch)
treea5832af11cd20bc6c3a235eb847ad48b569b05b8
parent.33 support (diff)
downloadhardened-patchset-705532ed7e36941a726b0fe668ce7efe9d11cc1f.tar.gz
hardened-patchset-705532ed7e36941a726b0fe668ce7efe9d11cc1f.tar.bz2
hardened-patchset-705532ed7e36941a726b0fe668ce7efe9d11cc1f.zip
Update vdso patch
-rw-r--r--kernel/2.6.33/4445_disable-compat_vdso.patch7
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/2.6.33/4445_disable-compat_vdso.patch b/kernel/2.6.33/4445_disable-compat_vdso.patch
index 950e381..8716cce 100644
--- a/kernel/2.6.33/4445_disable-compat_vdso.patch
+++ b/kernel/2.6.33/4445_disable-compat_vdso.patch
@@ -1,10 +1,9 @@
-From: Jory A. Pratt <anarchy@gentoo.org>
-
No need to wrap vdso calls as gentoo does not use any version of
glibc <=2.3.3
---
From: Gordon Malm <gengor@gentoo.org>
From: Kerin Millar <kerframil@gmail.com>
+From: Jory A. Pratt <anarchy@gentoo.org>
COMPAT_VDSO is inappropriate for any modern Hardened Gentoo system. It
conflicts with various parts of PaX, crashing the system if enabled
@@ -27,7 +26,7 @@ Closes bug: http://bugs.gentoo.org/show_bug.cgi?id=210138
diff -urp a/arch/x86/Kconfig b/arch/x86/Kconfig
--- a/arch/x86/Kconfig 2009-07-31 01:36:57.323857684 +0100
+++ b/arch/x86/Kconfig 2009-07-31 01:51:39.395749681 +0100
-@@ -1608,17 +1608,8 @@
+@@ -1607,17 +1607,8 @@
config COMPAT_VDSO
def_bool n
@@ -36,7 +35,7 @@ diff -urp a/arch/x86/Kconfig b/arch/x86/Kconfig
depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF
- ---help---
- Map the 32-bit VDSO to the predictable old-style address too.
-- ---help---
+-
- Say N here if you are running a sufficiently recent glibc
- version (2.3.3 or later), to remove the high-mapped
- VDSO mapping and to exclusively use the randomized VDSO.