[PATCH] nx-emu: fix inverted report of disable_nx

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxxxxx>
---
 arch/x86/mm/setup_nx.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
index b936b25..1d7a269 100644
--- 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
-- 
1.7.2.3


-- 
Kees Cook
Ubuntu Security Team
_______________________________________________
kernel mailing list
kernel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/kernel


[Index of Archives]     [Fedora General Discussion]     [Older Fedora Users Archive]     [Fedora Advisory Board]     [Fedora Security]     [Fedora Devel Java]     [Fedora Legacy]     [Fedora Desktop]     [ATA RAID]     [Fedora Marketing]     [Fedora Mentors]     [Fedora Package Announce]     [Fedora Package Review]     [Fedora Music]     [Fedora Packaging]     [Centos]     [Fedora SELinux]     [Coolkey]     [Yum Users]     [Tux]     [Yosemite News]     [KDE Users]     [Fedora Art]     [Fedora Docs]     [USB]     [Asterisk PBX]

  Powered by Linux