nx-emu: fix inverted report of disable_nx

This nx-emu commit:
http://git.kernel.org/?p=linux/kernel/git/frob/linux-2.6-roland.git;a=commitdiff;h=b86f45c02494d4cba26caf132e8a178854e812fd
was intended to replace "exec_shield" with "!disable_nx", but in
x86_report_nx() it was not correctly inverted resulting in a backward
report to dmesg about the state of nx-emu.

Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
index db006c1..4323de4 100644 (file)
--- a/arch/x86/mm/setup_nx.c
+++ b/arch/x86/mm/setup_nx.c
@@ -42,7 +42,7 @@ void __init x86_report_nx(void)
 {
        if (!cpu_has_nx) {
 #ifdef CONFIG_X86_32
-               if (disable_nx)
+               if (!disable_nx)
                        printk(KERN_INFO "NX (Execute Disable) protection: "
                               "approximated by x86 segment limits\n");
                else