linux-kernel - [tip:x86/mm] x86, pageattr: Make set_memory

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-583140afb989f24d115e80be5c91e503b58ccfc0@git.kernel.org>
Date:	Mon, 16 Nov 2009 22:07:12 GMT
From:	"tip-bot for H. Peter Anvin" <hpa@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
	venkatesh.pallipadi@...el.com, tstarling@...imedia.org,
	ying.huang@...el.com, kees.cook@...onical.com,
	suresh.b.siddha@...el.com, tj@...nel.org, hannes@...neseder.net,
	tglx@...utronix.de
Subject: [tip:x86/mm] x86, pageattr: Make set_memory_(x|nx) aware of NX support

Commit-ID:  583140afb989f24d115e80be5c91e503b58ccfc0
Gitweb:     http://git.kernel.org/tip/583140afb989f24d115e80be5c91e503b58ccfc0
Author:     H. Peter Anvin <hpa@...or.com>
AuthorDate: Fri, 13 Nov 2009 15:28:15 -0800
Committer:  H. Peter Anvin <hpa@...or.com>
CommitDate: Mon, 16 Nov 2009 13:44:58 -0800

x86, pageattr: Make set_memory_(x|nx) aware of NX support

Make set_memory_x/set_memory_nx directly aware of if NX is supported
in the system or not, rather than requiring that every caller assesses
that support independently.

Signed-off-by: H. Peter Anvin <hpa@...or.com>
Cc: Huang Ying <ying.huang@...el.com>
Cc: Venkatesh Pallipadi <venkatesh.pallipadi@...el.com>
Cc: Suresh Siddha <suresh.b.siddha@...el.com>
Cc: Tejun Heo <tj@...nel.org>
Cc: Tim Starling <tstarling@...imedia.org>
Cc: Hannes Eder <hannes@...neseder.net>
LKML-Reference: <1258154897-6770-4-git-send-email-hpa@...or.com>
Acked-by: Kees Cook <kees.cook@...onical.com>
---
 arch/x86/kernel/machine_kexec_32.c |    6 ++----
 arch/x86/mm/pageattr.c             |    6 ++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
index c1c429d..03657e7 100644
--- a/arch/x86/kernel/machine_kexec_32.c
+++ b/arch/x86/kernel/machine_kexec_32.c
@@ -157,8 +157,7 @@ int machine_kexec_prepare(struct kimage *image)
 {
 	int error;
 
-	if (nx_enabled)
-		set_pages_x(image->control_code_page, 1);
+	set_pages_x(image->control_code_page, 1);
 	error = machine_kexec_alloc_page_tables(image);
 	if (error)
 		return error;
@@ -172,8 +171,7 @@ int machine_kexec_prepare(struct kimage *image)
  */
 void machine_kexec_cleanup(struct kimage *image)
 {
-	if (nx_enabled)
-		set_pages_nx(image->control_code_page, 1);
+	set_pages_nx(image->control_code_page, 1);
 	machine_kexec_free_page_tables(image);
 }
 
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 09a140c..1d4eb93 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -1085,12 +1085,18 @@ EXPORT_SYMBOL(set_memory_array_wb);
 
 int set_memory_x(unsigned long addr, int numpages)
 {
+	if (!(__supported_pte_mask & _PAGE_NX))
+		return 0;
+
 	return change_page_attr_clear(&addr, numpages, __pgprot(_PAGE_NX), 0);
 }
 EXPORT_SYMBOL(set_memory_x);
 
 int set_memory_nx(unsigned long addr, int numpages)
 {
+	if (!(__supported_pte_mask & _PAGE_NX))
+		return 0;
+
 	return change_page_attr_set(&addr, numpages, __pgprot(_PAGE_NX), 0);
 }
 EXPORT_SYMBOL(set_memory_nx);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/