From: Kees Cook <kees.cook@canonical.com>
To: x86@kernel.org
Cc: "H. Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>,
Alexander Potashev <aspotashev@gmail.com>,
Tim Abbott <tabbott@ksplice.com>, Sam Ravnborg <sam@ravnborg.org>,
Jan Beulich <jbeulich@novell.com>,
Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 4/4] x86: only CPU features determine NX capabilities
Date: Fri, 18 Jun 2010 22:53:35 -0700 [thread overview]
Message-ID: <20100619055335.GV24749@outflux.net> (raw)
In-Reply-To: <20100619055010.GR24749@outflux.net>
Fix the NX feature boot warning when NX is missing to correctly
reflect that BIOSes cannot disable NX now.
Signed-off-by: Kees Cook <kees.cook@canonical.com>
---
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 a3250aa..410531d 100644
--- a/arch/x86/mm/setup_nx.c
+++ b/arch/x86/mm/setup_nx.c
@@ -41,7 +41,7 @@ void __init x86_report_nx(void)
{
if (!cpu_has_nx) {
printk(KERN_NOTICE "Notice: NX (Execute Disable) protection "
- "missing in CPU or disabled in BIOS!\n");
+ "missing in CPU!\n");
} else {
#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
if (disable_nx) {
--
1.7.1
--
Kees Cook
Ubuntu Security Team
next prev parent reply other threads:[~2010-06-19 5:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-19 5:50 [PATCH v2 0/4] x86: clear XD_DISABLED flag on Intel to regain NX Kees Cook
2010-06-19 5:51 ` [PATCH 1/4] x86: rename verify_cpu_64.S to verify_cpu.S Kees Cook
2010-06-19 5:52 ` [PATCH 2/4] x86: clear XD_DISABLED flag on Intel to regain NX Kees Cook
2010-06-19 5:52 ` [PATCH 3/4] x86: call verify_cpu during 32bit CPU startup Kees Cook
2010-06-19 5:53 ` Kees Cook [this message]
2010-06-19 8:21 ` [PATCH v2 0/4] x86: clear XD_DISABLED flag on Intel to regain NX Andi Kleen
2010-06-19 15:16 ` Arjan van de Ven
2010-06-19 17:54 ` Kees Cook
2010-06-19 18:08 ` H. Peter Anvin
2010-06-19 16:21 ` Kees Cook
-- strict thread matches above, loose matches on Subject: below --
2010-11-09 18:11 [Security] [PATCH v3 " Kees Cook
2010-11-09 18:15 ` [PATCH 4/4] x86: only CPU features determine NX capabilities Kees Cook
2010-11-09 22:17 [Security] [PATCH v4 0/4] x86: clear XD_DISABLED flag on Intel to regain NX Kees Cook
2010-11-09 22:19 ` [PATCH 4/4] x86: only CPU features determine NX capabilities Kees Cook
2010-11-10 18:35 [Security] [PATCH v5 0/4] x86: clear XD_DISABLED flag on Intel to regain NX Kees Cook
2010-11-10 18:35 ` [PATCH 4/4] x86: only CPU features determine NX capabilities Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100619055335.GV24749@outflux.net \
--to=kees.cook@canonical.com \
--cc=aspotashev@gmail.com \
--cc=hpa@zytor.com \
--cc=jbeulich@novell.com \
--cc=jeremy.fitzhardinge@citrix.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=sam@ravnborg.org \
--cc=tabbott@ksplice.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.