From 474849beb10e9d241fc3c07f477bb5bf01967eca Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Mon, 4 Jun 2012 11:55:51 -0400 Subject: [PATCH] disable 32bit nx, it seems to be broken --- kernel.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/kernel.spec b/kernel.spec index 216b3fb61..41b912e3b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1316,9 +1316,12 @@ ApplyPatch taint-vbox.patch # # NX Emulation # -ApplyPatch linux-2.6-32bit-mmap-exec-randomization.patch -ApplyPatch linux-2.6-i386-nx-emulation.patch -ApplyPatch nx-emu-remove-cpuinitdata-for-disable_nx-on-x86_32.patch +#ApplyPatch linux-2.6-32bit-mmap-exec-randomization.patch +#ApplyPatch linux-2.6-i386-nx-emulation.patch +#ApplyPatch nx-emu-remove-cpuinitdata-for-disable_nx-on-x86_32.patch +#rhbz 804957 CVE-2012-1568 +#ApplyPatch shlib_base_randomize.patch + # # bugfixes to drivers and filesystems @@ -1460,9 +1463,6 @@ ApplyPatch rt2x00_fix_MCU_request_failures.patch #rhbz 789644 ApplyPatch mcelog-rcu-splat.patch -#rhbz 804957 CVE-2012-1568 -ApplyPatch shlib_base_randomize.patch - ApplyPatch unhandled-irqs-switch-to-polling.patch # debug patches @@ -2239,6 +2239,9 @@ fi # and build. %changelog +* Mon Jun 04 2012 Dave Jones +- Disable 32bit NX emulation. + * Wed May 30 2012 Josh Boyer - CVE-2012-2390 huge pages: memory leak on mmap failure (rhbz 824352 824345)