Skip to contentSkip to conversation

x86: fix exec mappings comments

PATCH In review Jiri Slaby 2 participants 3 messages Apr 12, 2008 – Apr 13, 2008

Subsystems (2)
lore
Share & tools
lore

Jiri Slaby

author
#0 lore raw

PATCH 1/1 x86: fix exec mappings comments

- noexec32 is on by default for years already
- add noexec32 to kernel-parameters and fix noexec type in there

---
 Documentation/kernel-parameters.txt |   10 +++++++++-
 arch/x86/kernel/setup64.c           |    4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)
Documentation/kernel-parameters.txt +9 -1
index a52524c..b0f7c13 100644
@@ -1285,8 +1285,16 @@ and is between 256 and 4096 characters. It is defined in the file
 	noexec		[IA-64]
 
 	noexec		[X86-32,X86-64]
+			On X86-32 available only on PAE configured kernels.
 			noexec=on: enable non-executable mappings (default)
-			noexec=off: disable nn-executable mappings
+			noexec=off: disable non-executable mappings
+
+	noexec32	[X86-64]
+			This affects only 32-bit executables.
+			noexec32=on: enable non-executable mappings (default)
+				read doesn't imply executable mappings
+			noexec32=off: disable non-executable mappings
+				read implies executable mappings
 
 	nofxsr		[BUGS=X86-32] Disables x86 floating point extended
 			register save and restore. The kernel will only save
arch/x86/kernel/setup64.c +2 -2
index 9042fb0..aee0e82 100644
@@ -74,8 +74,8 @@ int force_personality32 = 0;
 Control non executable heap for 32bit processes.
 To control the stack too use noexec=off
 
-on	PROT_READ does not imply PROT_EXEC for 32bit processes
-off	PROT_READ implies PROT_EXEC (default)
+on	PROT_READ does not imply PROT_EXEC for 32bit processes (default)
+off	PROT_READ implies PROT_EXEC
 */
 static int __init nonx32_setup(char *str)
 {
Signature · 1 line
1.5.4.5
author
#1 lore raw
Quoted 2 lines · Jiri Slaby

- noexec32 is on by default for years already
- add noexec32 to kernel-parameters and fix noexec type in there

I meant "typo".

#2 lore raw
In reply to Jiri Slaby
Quoted 2 lines · Jiri Slaby

- noexec32 is on by default for years already
- add noexec32 to kernel-parameters and fix noexec type in there

thanks Jiri, applied.

Ingo