binfmt_elf: Update READ_IMPLIES_EXEC logic for modern CPUs
Subsystems (5)
v5 cover binfmt_elf: Update READ_IMPLIES_EXEC logic for modern CPUs
Hi,
This continues my attempt to fix READ_IMPLIES_EXEC. :)
This series is for x86, arm, and arm64; I'd like it to go via -tip, though, just to keep these changes together, as they're related. (Note that most other architectures don't suffer from this problem. e.g. powerpc's behavior appears to already be correct. MIPS may need adjusting but the history of CPU features and toolchain behavior is very unclear to me.)
Repeating the commit log from later in the series:
The READ_IMPLIES_EXEC work-around was designed for old toolchains that lacked the ELF PT_GNU_STACK marking under the assumption that toolchains that couldn't specify executable permission flags for the stack may not know how to do it correctly for any memory region.
This logic is sensible for having ancient binaries coexist in a system with possibly NX memory, but was implemented in a way that equated having a PT_GNU_STACK marked executable as being as "broken" as lacking the PT_GNU_STACK marking entirely. Things like unmarked assembly and stack trampolines may cause PT_GNU_STACK to need an executable bit, but they do not imply all mappings must be executable.
This confusion has led to situations where modern programs with explicitly marked executable stack are forced into the READ_IMPLIES_EXEC state when no such thing is needed. (And leads to unexpected failures when mmap()ing regions of device driver memory that wish to disallow VM_EXEC[1].)
In looking for other reasons for the READ_IMPLIES_EXEC behavior, Jann Horn noted that glibc thread stacks have always been marked RWX (until 2003 when they started tracking the PT_GNU_STACK flag instead[2]). And musl doesn't support executable stacks at all[3]. As such, no breakage for multithreaded applications is expected from this change.
[1] https://lkml.kernel.org/r/[email protected]
[2] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=54ee14b3882
[3] https://lkml.kernel.org/r/[email protected]
Thanks!
-Kees
v5:
- re-align tables and use full name of PT_GNU_STACK (bp)
v4: https://lore.kernel.org/lkml/[email protected]
v3: https://lore.kernel.org/lkml/[email protected]
v2: https://lore.kernel.org/lkml/20190424203408.GA11386@beast/
v1: https://lore.kernel.org/lkml/20190423181210.GA2443@beast/
Kees Cook (6):
x86/elf: Add table to document READ_IMPLIES_EXEC
x86/elf: Split READ_IMPLIES_EXEC from executable PT_GNU_STACK x86/elf: Disable automatic READ_IMPLIES_EXEC for 64-bit address spaces arm32/64, elf: Add tables to document READ_IMPLIES_EXEC arm32/64, elf: Split READ_IMPLIES_EXEC from executable PT_GNU_STACK arm64, elf: Disable automatic READ_IMPLIES_EXEC for 64-bit address
spaces
arch/arm/kernel/elf.c | 27 +++++++++++++++++++++++---- arch/arm64/include/asm/elf.h | 23 ++++++++++++++++++++++- arch/x86/include/asm/elf.h | 22 +++++++++++++++++++++- fs/compat_binfmt_elf.c | 5 +++++ 4 files changed, 71 insertions(+), 6 deletions(-)
Signature · 1 line
2.20.1
PATCH v5 1/6 x86/elf: Add table to document READ_IMPLIES_EXEC
Add a table to document the current behavior of READ_IMPLIES_EXEC in preparation for changing the behavior.
--- arch/x86/include/asm/elf.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
arch/x86/include/asm/elf.h +19 -0
@@ -281,6 +281,25 @@ extern u32 elf_hwcap2;/* * An executable for which elf_read_implies_exec() returns TRUE will * have the READ_IMPLIES_EXEC personality flag set automatically. +* +* The decision process for determining the results are: +* +* CPU: | lacks NX* | has NX, ia32 | has NX, x86_64 | +* ELF: | | | | +* ---------------------|------------|------------------|----------------| +* missing PT_GNU_STACK | exec-all | exec-all | exec-all | +* PT_GNU_STACK == RWX | exec-all | exec-all | exec-all | +* PT_GNU_STACK == RW | exec-none | exec-none | exec-none | +* +* exec-all : all PROT_READ user mappings are executable, except when +* backed by files on a noexec-filesystem. +* exec-none : only PROT_EXEC user mappings are executable. +* +* *this column has no architectural effect: NX markings are ignored by +* hardware, but may have behavioral effects when "wants X" collides with +* "cannot be X" constraints in memory permission flags, as in +* https://lkml.kernel.org/r/[email protected] +* */ #define elf_read_implies_exec (ex, executable_stack) \ (executable_stack != EXSTACK_DISABLE_X)
Signature · 1 line
2.20.1
[tip: core/core] x86/elf: Add table to document READ_IMPLIES_EXEC
The following commit has been merged into the core/core branch of tip:
The following commit has been merged into the core/core branch of tip:
Commit-ID: 9d9e435f3f2492bfd196acacb61cc9a9212d8170 Gitweb: https://git.kernel.org/tip/9d9e435f3f2492bfd196acacb61cc9a9212d8170 Author: Kees Cook <[email protected]> AuthorDate: Thu, 26 Mar 2020 23:48:15 -07:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Mon, 20 Apr 2020 15:28:40 +02:00
x86/elf: Add table to document READ_IMPLIES_EXEC
Add a table to document the current behavior of READ_IMPLIES_EXEC in preparation for changing the behavior.
--- arch/x86/include/asm/elf.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
arch/x86/include/asm/elf.h +19 -0
@@ -281,6 +281,25 @@ extern u32 elf_hwcap2;/* * An executable for which elf_read_implies_exec() returns TRUE will * have the READ_IMPLIES_EXEC personality flag set automatically. +* +* The decision process for determining the results are: +* +* CPU: | lacks NX* | has NX, ia32 | has NX, x86_64 | +* ELF: | | | | +* ---------------------|------------|------------------|----------------| +* missing PT_GNU_STACK | exec-all | exec-all | exec-all | +* PT_GNU_STACK == RWX | exec-all | exec-all | exec-all | +* PT_GNU_STACK == RW | exec-none | exec-none | exec-none | +* +* exec-all : all PROT_READ user mappings are executable, except when +* backed by files on a noexec-filesystem. +* exec-none : only PROT_EXEC user mappings are executable. +* +* *this column has no architectural effect: NX markings are ignored by +* hardware, but may have behavioral effects when "wants X" collides with +* "cannot be X" constraints in memory permission flags, as in +* https://lkml.kernel.org/r/[email protected] +* */ #define elf_read_implies_exec (ex, executable_stack) \ (executable_stack != EXSTACK_DISABLE_X)
PATCH v5 2/6 x86/elf: Split READ_IMPLIES_EXEC from executable PT_GNU_STACK
In reply to Kees CookThe READ_IMPLIES_EXEC work-around was designed for old toolchains that lacked the ELF PT_GNU_STACK marking under the assumption that toolchains that couldn't specify executable permission flags for the stack may not know how to do it correctly for any memory region.
This logic is sensible for having ancient binaries coexist in a system with possibly NX memory, but was implemented in a way that equated having a PT_GNU_STACK marked executable as being as "broken" as lacking the PT_GNU_STACK marking entirely. Things like unmarked assembly and stack trampolines may cause PT_GNU_STACK to need an executable bit, but they do not imply all mappings must be executable.
This confusion has led to situations where modern programs with explicitly marked executable stack are forced into the READ_IMPLIES_EXEC state when no such thing is needed. (And leads to unexpected failures when mmap()ing regions of device driver memory that wish to disallow VM_EXEC[1].)
In looking for other reasons for the READ_IMPLIES_EXEC behavior, Jann Horn noted that glibc thread stacks have always been marked RWX (until 2003 when they started tracking the PT_GNU_STACK flag instead[2]). And musl doesn't support executable stacks at all[3]. As such, no breakage for multithreaded applications is expected from this change.
[1] https://lkml.kernel.org/r/[email protected]
[2] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=54ee14b3882
[3] https://lkml.kernel.org/r/[email protected]
--- arch/x86/include/asm/elf.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/include/asm/elf.h +3 -2
@@ -288,12 +288,13 @@ extern u32 elf_hwcap2;* ELF: | | | | * ---------------------|------------|------------------|----------------| * missing PT_GNU_STACK | exec-all | exec-all | exec-all | -* PT_GNU_STACK == RWX | exec-all | exec-all | exec-all | +* PT_GNU_STACK == RWX | exec-stack | exec-stack | exec-stack | * PT_GNU_STACK == RW | exec-none | exec-none | exec-none | * * exec-all : all PROT_READ user mappings are executable, except when * backed by files on a noexec-filesystem. * exec-none : only PROT_EXEC user mappings are executable. +* exec-stack: only the stack and PROT_EXEC user mappings are executable. * * *this column has no architectural effect: NX markings are ignored by * hardware, but may have behavioral effects when "wants X" collides with
@@ -302,7 +303,7 @@ extern u32 elf_hwcap2;* */ #define elf_read_implies_exec (ex, executable_stack) \ - (executable_stack != EXSTACK_DISABLE_X) + (executable_stack == EXSTACK_DEFAULT)struct task_struct ;
Signature · 1 line
2.20.1
[tip: core/core] x86/elf: Split READ_IMPLIES_EXEC from executable PT_GNU_STACK
The following commit has been merged into the core/core branch of tip:
The following commit has been merged into the core/core branch of tip:
Commit-ID: 122306117afe4ba202b5e57c61dfbeffc5c41387 Gitweb: https://git.kernel.org/tip/122306117afe4ba202b5e57c61dfbeffc5c41387 Author: Kees Cook <[email protected]> AuthorDate: Thu, 26 Mar 2020 23:48:16 -07:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Mon, 20 Apr 2020 19:09:38 +02:00
x86/elf: Split READ_IMPLIES_EXEC from executable PT_GNU_STACK
The READ_IMPLIES_EXEC workaround was designed for old toolchains that lacked the ELF PT_GNU_STACK marking under the assumption that toolchains that couldn't specify executable permission flags for the stack may not know how to do it correctly for any memory region.
This logic is sensible for having ancient binaries coexist in a system with possibly NX memory, but was implemented in a way that equated having a PT_GNU_STACK marked executable as being as "broken" as lacking the PT_GNU_STACK marking entirely. Things like unmarked assembly and stack trampolines may cause PT_GNU_STACK to need an executable bit, but they do not imply all mappings must be executable.
This confusion has led to situations where modern programs with explicitly marked executable stacks are forced into the READ_IMPLIES_EXEC state when no such thing is needed. (And leads to unexpected failures when mmap()ing regions of device driver memory that wish to disallow VM_EXEC[1].)
In looking for other reasons for the READ_IMPLIES_EXEC behavior, Jann Horn noted that glibc thread stacks have always been marked RWX (until 2003 when they started tracking the PT_GNU_STACK flag instead[2]). And musl doesn't support executable stacks at all[3]. As such, no breakage for multithreaded applications is expected from this change.
[1] https://lkml.kernel.org/r/[email protected]
[2] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=54ee14b3882
[3] https://lkml.kernel.org/r/[email protected]
--- arch/x86/include/asm/elf.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/include/asm/elf.h +3 -2
@@ -288,12 +288,13 @@ extern u32 elf_hwcap2;* ELF: | | | | * ---------------------|------------|------------------|----------------| * missing PT_GNU_STACK | exec-all | exec-all | exec-all | -* PT_GNU_STACK == RWX | exec-all | exec-all | exec-all | +* PT_GNU_STACK == RWX | exec-stack | exec-stack | exec-stack | * PT_GNU_STACK == RW | exec-none | exec-none | exec-none | * * exec-all : all PROT_READ user mappings are executable, except when * backed by files on a noexec-filesystem. * exec-none : only PROT_EXEC user mappings are executable. +* exec-stack: only the stack and PROT_EXEC user mappings are executable. * * *this column has no architectural effect: NX markings are ignored by * hardware, but may have behavioral effects when "wants X" collides with
@@ -302,7 +303,7 @@ extern u32 elf_hwcap2;* */ #define elf_read_implies_exec (ex, executable_stack) \ - (executable_stack != EXSTACK_DISABLE_X) + (executable_stack == EXSTACK_DEFAULT)struct task_struct ;
PATCH v5 3/6 x86/elf: Disable automatic READ_IMPLIES_EXEC for 64-bit address spaces
In reply to Kees CookWith modern x86 64-bit environments, there should never be a need for automatic READ_IMPLIES_EXEC, as the architecture is intended to always be execute-bit aware (as in, the default memory protection should be NX unless a region explicitly requests to be executable).
There were very old x86_64 systems that lacked the NX bit, but for those, the NX bit is, obviously, unenforceable, so these changes should have no impact on them.
--- arch/x86/include/asm/elf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/elf.h +2 -2
@@ -287,7 +287,7 @@ extern u32 elf_hwcap2;* CPU: | lacks NX* | has NX, ia32 | has NX, x86_64 | * ELF: | | | | * ---------------------|------------|------------------|----------------| -* missing PT_GNU_STACK | exec-all | exec-all | exec-all | +* missing PT_GNU_STACK | exec-all | exec-all | exec-none | * PT_GNU_STACK == RWX | exec-stack | exec-stack | exec-stack | * PT_GNU_STACK == RW | exec-none | exec-none | exec-none | *
@@ -303,7 +303,7 @@ extern u32 elf_hwcap2;* */ #define elf_read_implies_exec (ex, executable_stack) \ - (executable_stack == EXSTACK_DEFAULT) + (mmap_is_ia32() && executable_stack == EXSTACK_DEFAULT)struct task_struct ;
Signature · 1 line
2.20.1
[tip: core/core] x86/elf: Disable automatic READ_IMPLIES_EXEC on 64-bit
The following commit has been merged into the core/core branch of tip:
The following commit has been merged into the core/core branch of tip:
Commit-ID: 9fccc5c0c99f238aa1b0460fccbdb30a887e7036 Gitweb: https://git.kernel.org/tip/9fccc5c0c99f238aa1b0460fccbdb30a887e7036 Author: Kees Cook <[email protected]> AuthorDate: Thu, 26 Mar 2020 23:48:17 -07:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Mon, 20 Apr 2020 19:24:33 +02:00
x86/elf: Disable automatic READ_IMPLIES_EXEC on 64-bit
With modern x86 64-bit environments, there should never be a need for automatic READ_IMPLIES_EXEC, as the architecture is intended to always be execute-bit aware (as in, the default memory protection should be NX unless a region explicitly requests to be executable).
There were very old x86_64 systems that lacked the NX bit, but for those, the NX bit is, obviously, unenforceable, so these changes should have no impact on them.
--- arch/x86/include/asm/elf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/elf.h +2 -2
@@ -287,7 +287,7 @@ extern u32 elf_hwcap2;* CPU: | lacks NX* | has NX, ia32 | has NX, x86_64 | * ELF: | | | | * ---------------------|------------|------------------|----------------| -* missing PT_GNU_STACK | exec-all | exec-all | exec-all | +* missing PT_GNU_STACK | exec-all | exec-all | exec-none | * PT_GNU_STACK == RWX | exec-stack | exec-stack | exec-stack | * PT_GNU_STACK == RW | exec-none | exec-none | exec-none | *
@@ -303,7 +303,7 @@ extern u32 elf_hwcap2;* */ #define elf_read_implies_exec (ex, executable_stack) \ - (executable_stack == EXSTACK_DEFAULT) + (mmap_is_ia32() && executable_stack == EXSTACK_DEFAULT)struct task_struct ;
PATCH v5 4/6 arm32/64, elf: Add tables to document READ_IMPLIES_EXEC
In reply to Kees CookAdd tables to document the current behavior of READ_IMPLIES_EXEC in preparation for changing the behavior for both arm64 and arm.
--- arch/arm/kernel/elf.c | 24 +++++++++++++++++++++--- arch/arm64/include/asm/elf.h | 20 ++++++++++++++++++++ 2 files changed, 41 insertions(+), 3 deletions(-)
arch/arm/kernel/elf.c +21 -3
@@ -78,9 +78,27 @@ void elf_set_personality(const struct elf32_hdr *x)EXPORT_SYMBOL (elf_set_personality);/* -* Set READ_IMPLIES_EXEC if: -* - the binary requires an executable stack -* - we're running on a CPU which doesn't support NX. +* An executable for which elf_read_implies_exec() returns TRUE will +* have the READ_IMPLIES_EXEC personality flag set automatically. +* +* The decision process for determining the results are: +* +* CPU: | lacks NX* | has NX | +* ELF: | | | +* ---------------------|------------|------------| +* missing PT_GNU_STACK | exec-all | exec-all | +* PT_GNU_STACK == RWX | exec-all | exec-all | +* PT_GNU_STACK == RW | exec-all | exec-none | +* +* exec-all : all PROT_READ user mappings are executable, except when +* backed by files on a noexec-filesystem. +* exec-none : only PROT_EXEC user mappings are executable. +* +* *this column has no architectural effect: NX markings are ignored by +* hardware, but may have behavioral effects when "wants X" collides with +* "cannot be X" constraints in memory permission flags, as in +* https://lkml.kernel.org/r/[email protected] +* */ int arm_elf_read_implies_exec (int executable_stack) {
arch/arm64/include/asm/elf.h +20 -0
@@ -96,6 +96,26 @@*/ #define elf_check_arch (x) ((x)->e_machine == EM_AARCH64) +/* +* An executable for which elf_read_implies_exec() returns TRUE will +* have the READ_IMPLIES_EXEC personality flag set automatically. +* +* The decision process for determining the results are: +* +* CPU*: | arm32 | arm64 | +* ELF: | | | +* ---------------------|------------|------------| +* missing PT_GNU_STACK | exec-all | exec-all | +* PT_GNU_STACK == RWX | exec-all | exec-all | +* PT_GNU_STACK == RW | exec-none | exec-none | +* +* exec-all : all PROT_READ user mappings are executable, except when +* backed by files on a noexec-filesystem. +* exec-none : only PROT_EXEC user mappings are executable. +* +* *all arm64 CPUs support NX, so there is no "lacks NX" column. +* +*/ #define elf_read_implies_exec (ex,stk) (stk != EXSTACK_DISABLE_X)#define CORE_DUMP_USE_REGSET
Signature · 1 line
2.20.1
[tip: core/core] arm32/64/elf: Add tables to document READ_IMPLIES_EXEC
The following commit has been merged into the core/core branch of tip:
The following commit has been merged into the core/core branch of tip:
Commit-ID: 78066055b08096ed3282c027de9d9e137f9a1580 Gitweb: https://git.kernel.org/tip/78066055b08096ed3282c027de9d9e137f9a1580 Author: Kees Cook <[email protected]> AuthorDate: Thu, 26 Mar 2020 23:48:18 -07:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Mon, 20 Apr 2020 19:41:50 +02:00
arm32/64/elf: Add tables to document READ_IMPLIES_EXEC
Add tables to document the current behavior of READ_IMPLIES_EXEC in preparation for changing the behavior for both arm64 and arm.
--- arch/arm/kernel/elf.c | 24 +++++++++++++++++++++--- arch/arm64/include/asm/elf.h | 20 ++++++++++++++++++++ 2 files changed, 41 insertions(+), 3 deletions(-)
arch/arm/kernel/elf.c +21 -3
@@ -78,9 +78,27 @@ void elf_set_personality(const struct elf32_hdr *x)EXPORT_SYMBOL (elf_set_personality);/* -* Set READ_IMPLIES_EXEC if: -* - the binary requires an executable stack -* - we're running on a CPU which doesn't support NX. +* An executable for which elf_read_implies_exec() returns TRUE will +* have the READ_IMPLIES_EXEC personality flag set automatically. +* +* The decision process for determining the results are: +* +* CPU: | lacks NX* | has NX | +* ELF: | | | +* ---------------------|------------|------------| +* missing PT_GNU_STACK | exec-all | exec-all | +* PT_GNU_STACK == RWX | exec-all | exec-all | +* PT_GNU_STACK == RW | exec-all | exec-none | +* +* exec-all : all PROT_READ user mappings are executable, except when +* backed by files on a noexec-filesystem. +* exec-none : only PROT_EXEC user mappings are executable. +* +* *this column has no architectural effect: NX markings are ignored by +* hardware, but may have behavioral effects when "wants X" collides with +* "cannot be X" constraints in memory permission flags, as in +* https://lkml.kernel.org/r/[email protected] +* */ int arm_elf_read_implies_exec (int executable_stack) {
arch/arm64/include/asm/elf.h +20 -0
@@ -96,6 +96,26 @@*/ #define elf_check_arch (x) ((x)->e_machine == EM_AARCH64) +/* +* An executable for which elf_read_implies_exec() returns TRUE will +* have the READ_IMPLIES_EXEC personality flag set automatically. +* +* The decision process for determining the results are: +* +* CPU*: | arm32 | arm64 | +* ELF: | | | +* ---------------------|------------|------------| +* missing PT_GNU_STACK | exec-all | exec-all | +* PT_GNU_STACK == RWX | exec-all | exec-all | +* PT_GNU_STACK == RW | exec-none | exec-none | +* +* exec-all : all PROT_READ user mappings are executable, except when +* backed by files on a noexec-filesystem. +* exec-none : only PROT_EXEC user mappings are executable. +* +* *all arm64 CPUs support NX, so there is no "lacks NX" column. +* +*/ #define elf_read_implies_exec (ex,stk) (stk != EXSTACK_DISABLE_X)#define CORE_DUMP_USE_REGSET
PATCH v5 5/6 arm32/64, elf: Split READ_IMPLIES_EXEC from executable PT_GNU_STACK
In reply to Kees CookThe READ_IMPLIES_EXEC work-around was designed for old toolchains that lacked the ELF PT_GNU_STACK marking under the assumption that toolchains that couldn't specify executable permission flags for the stack may not know how to do it correctly for any memory region.
This logic is sensible for having ancient binaries coexist in a system with possibly NX memory, but was implemented in a way that equated having a PT_GNU_STACK marked executable as being as "broken" as lacking the PT_GNU_STACK marking entirely. Things like unmarked assembly and stack trampolines may cause PT_GNU_STACK to need an executable bit, but they do not imply all mappings must be executable.
This confusion has led to situations where modern programs with explicitly marked executable stack are forced into the READ_IMPLIES_EXEC state when no such thing is needed. (And leads to unexpected failures when mmap()ing regions of device driver memory that wish to disallow VM_EXEC[1].)
In looking for other reasons for the READ_IMPLIES_EXEC behavior, Jann Horn noted that glibc thread stacks have always been marked RWX (until 2003 when they started tracking the PT_GNU_STACK flag instead[2]). And musl doesn't support executable stacks at all[3]. As such, no breakage for multithreaded applications is expected from this change.
This changes arm32 and arm64 compat together, to keep behavior the same.
[1] https://lkml.kernel.org/r/[email protected]
[2] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=54ee14b3882
[3] https://lkml.kernel.org/r/[email protected]
--- arch/arm/kernel/elf.c | 5 +++-- arch/arm64/include/asm/elf.h | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)
arch/arm/kernel/elf.c +3 -2
@@ -87,12 +87,13 @@ EXPORT_SYMBOL(elf_set_personality);* ELF: | | | * ---------------------|------------|------------| * missing PT_GNU_STACK | exec-all | exec-all | -* PT_GNU_STACK == RWX | exec-all | exec-all | +* PT_GNU_STACK == RWX | exec-all | exec-stack | * PT_GNU_STACK == RW | exec-all | exec-none | * * exec-all : all PROT_READ user mappings are executable, except when * backed by files on a noexec-filesystem. * exec-none : only PROT_EXEC user mappings are executable. +* exec-stack: only the stack and PROT_EXEC user mappings are executable. * * *this column has no architectural effect: NX markings are ignored by * hardware, but may have behavioral effects when "wants X" collides with
@@ -102,7 +103,7 @@ EXPORT_SYMBOL(elf_set_personality);*/ int arm_elf_read_implies_exec (int executable_stack) { -if (executable_stack !=EXSTACK_DISABLE_X ) +if (executable_stack ==EXSTACK_DEFAULT )return 1 ;if (cpu_architecture () < CPU_ARCH_ARMv6)return 1 ;
arch/arm64/include/asm/elf.h +3 -2
@@ -106,17 +106,18 @@* ELF: | | | * ---------------------|------------|------------| * missing PT_GNU_STACK | exec-all | exec-all | -* PT_GNU_STACK == RWX | exec-all | exec-all | +* PT_GNU_STACK == RWX | exec-stack | exec-stack | * PT_GNU_STACK == RW | exec-none | exec-none | * * exec-all : all PROT_READ user mappings are executable, except when * backed by files on a noexec-filesystem. * exec-none : only PROT_EXEC user mappings are executable. +* exec-stack: only the stack and PROT_EXEC user mappings are executable. * * *all arm64 CPUs support NX, so there is no "lacks NX" column. * */ -#define elf_read_implies_exec (ex,stk) (stk != EXSTACK_DISABLE_X) +#define elf_read_implies_exec (ex, stk) (stk == EXSTACK_DEFAULT)#define CORE_DUMP_USE_REGSET #define ELF_EXEC_PAGESIZE PAGE_SIZE
Signature · 1 line
2.20.1
[tip: core/core] arm32/64/elf: Split READ_IMPLIES_EXEC from executable PT_GNU_STACK
The following commit has been merged into the core/core branch of tip:
The following commit has been merged into the core/core branch of tip:
Commit-ID: eaf3f9e61887332d5097dbf0b327b8377546adc5 Gitweb: https://git.kernel.org/tip/eaf3f9e61887332d5097dbf0b327b8377546adc5 Author: Kees Cook <[email protected]> AuthorDate: Thu, 26 Mar 2020 23:48:19 -07:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Mon, 20 Apr 2020 19:42:19 +02:00
arm32/64/elf: Split READ_IMPLIES_EXEC from executable PT_GNU_STACK
The READ_IMPLIES_EXEC work-around was designed for old toolchains that lacked the ELF PT_GNU_STACK marking under the assumption that toolchains that couldn't specify executable permission flags for the stack may not know how to do it correctly for any memory region.
This logic is sensible for having ancient binaries coexist in a system with possibly NX memory, but was implemented in a way that equated having a PT_GNU_STACK marked executable as being as "broken" as lacking the PT_GNU_STACK marking entirely. Things like unmarked assembly and stack trampolines may cause PT_GNU_STACK to need an executable bit, but they do not imply all mappings must be executable.
This confusion has led to situations where modern programs with explicitly marked executable stack are forced into the READ_IMPLIES_EXEC state when no such thing is needed. (And leads to unexpected failures when mmap()ing regions of device driver memory that wish to disallow VM_EXEC[1].)
In looking for other reasons for the READ_IMPLIES_EXEC behavior, Jann Horn noted that glibc thread stacks have always been marked RWX (until 2003 when they started tracking the PT_GNU_STACK flag instead[2]). And musl doesn't support executable stacks at all[3]. As such, no breakage for multithreaded applications is expected from this change.
This changes arm32 and arm64 compat together, to keep behavior the same.
[1] https://lkml.kernel.org/r/[email protected]
[2] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=54ee14b3882
[3] https://lkml.kernel.org/r/[email protected]
--- arch/arm/kernel/elf.c | 5 +++-- arch/arm64/include/asm/elf.h | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)
arch/arm/kernel/elf.c +3 -2
@@ -87,12 +87,13 @@ EXPORT_SYMBOL(elf_set_personality);* ELF: | | | * ---------------------|------------|------------| * missing PT_GNU_STACK | exec-all | exec-all | -* PT_GNU_STACK == RWX | exec-all | exec-all | +* PT_GNU_STACK == RWX | exec-all | exec-stack | * PT_GNU_STACK == RW | exec-all | exec-none | * * exec-all : all PROT_READ user mappings are executable, except when * backed by files on a noexec-filesystem. * exec-none : only PROT_EXEC user mappings are executable. +* exec-stack: only the stack and PROT_EXEC user mappings are executable. * * *this column has no architectural effect: NX markings are ignored by * hardware, but may have behavioral effects when "wants X" collides with
@@ -102,7 +103,7 @@ EXPORT_SYMBOL(elf_set_personality);*/ int arm_elf_read_implies_exec (int executable_stack) { -if (executable_stack !=EXSTACK_DISABLE_X ) +if (executable_stack ==EXSTACK_DEFAULT )return 1 ;if (cpu_architecture () < CPU_ARCH_ARMv6)return 1 ;
arch/arm64/include/asm/elf.h +3 -2
@@ -106,17 +106,18 @@* ELF: | | | * ---------------------|------------|------------| * missing PT_GNU_STACK | exec-all | exec-all | -* PT_GNU_STACK == RWX | exec-all | exec-all | +* PT_GNU_STACK == RWX | exec-stack | exec-stack | * PT_GNU_STACK == RW | exec-none | exec-none | * * exec-all : all PROT_READ user mappings are executable, except when * backed by files on a noexec-filesystem. * exec-none : only PROT_EXEC user mappings are executable. +* exec-stack: only the stack and PROT_EXEC user mappings are executable. * * *all arm64 CPUs support NX, so there is no "lacks NX" column. * */ -#define elf_read_implies_exec (ex,stk) (stk != EXSTACK_DISABLE_X) +#define elf_read_implies_exec (ex, stk) (stk == EXSTACK_DEFAULT)#define CORE_DUMP_USE_REGSET #define ELF_EXEC_PAGESIZE PAGE_SIZE
PATCH v5 6/6 arm64, elf: Disable automatic READ_IMPLIES_EXEC for 64-bit address spaces
In reply to Kees CookWith arm64 64-bit environments, there should never be a need for automatic READ_IMPLIES_EXEC, as the architecture has always been execute-bit aware (as in, the default memory protection should be NX unless a region explicitly requests to be executable).
--- arch/arm64/include/asm/elf.h | 4 ++-- fs/compat_binfmt_elf.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-)
arch/arm64/include/asm/elf.h +2 -2
@@ -105,7 +105,7 @@* CPU*: | arm32 | arm64 | * ELF: | | | * ---------------------|------------|------------| -* missing PT_GNU_STACK | exec-all | exec-all | +* missing PT_GNU_STACK | exec-all | exec-none | * PT_GNU_STACK == RWX | exec-stack | exec-stack | * PT_GNU_STACK == RW | exec-none | exec-none | *
@@ -117,7 +117,7 @@* *all arm64 CPUs support NX, so there is no "lacks NX" column. * */ -#define elf_read_implies_exec (ex, stk) (stk == EXSTACK_DEFAULT) +#define compat_elf_read_implies_exec (ex, stk) (stk == EXSTACK_DEFAULT)#define CORE_DUMP_USE_REGSET #define ELF_EXEC_PAGESIZE PAGE_SIZE
fs/compat_binfmt_elf.c +5 -0
@@ -113,6 +113,11 @@#define arch_setup_additional_pages compat_arch_setup_additional_pages#endif +#ifdef compat_elf_read_implies_exec +#undef elf_read_implies_exec +#define elf_read_implies_exec compat_elf_read_implies_exec +#endif +/* * Rename a few of the symbols that binfmt_elf.c will define. * These are all local so the names don't really matter, but it
Signature · 1 line
2.20.1
[tip: core/core] arm64/elf: Disable automatic READ_IMPLIES_EXEC for 64-bit address spaces
The following commit has been merged into the core/core branch of tip:
The following commit has been merged into the core/core branch of tip:
Commit-ID: 6e0d6ac5f3d9d90271899f6d340872360fe1caee Gitweb: https://git.kernel.org/tip/6e0d6ac5f3d9d90271899f6d340872360fe1caee Author: Kees Cook <[email protected]> AuthorDate: Thu, 26 Mar 2020 23:48:20 -07:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Mon, 20 Apr 2020 19:44:27 +02:00
arm64/elf: Disable automatic READ_IMPLIES_EXEC for 64-bit address spaces
With arm64 64-bit environments, there should never be a need for automatic READ_IMPLIES_EXEC, as the architecture has always been execute-bit aware (as in, the default memory protection should be NX unless a region explicitly requests to be executable).
--- arch/arm64/include/asm/elf.h | 4 ++-- fs/compat_binfmt_elf.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-)
arch/arm64/include/asm/elf.h +2 -2
@@ -105,7 +105,7 @@* CPU*: | arm32 | arm64 | * ELF: | | | * ---------------------|------------|------------| -* missing PT_GNU_STACK | exec-all | exec-all | +* missing PT_GNU_STACK | exec-all | exec-none | * PT_GNU_STACK == RWX | exec-stack | exec-stack | * PT_GNU_STACK == RW | exec-none | exec-none | *
@@ -117,7 +117,7 @@* *all arm64 CPUs support NX, so there is no "lacks NX" column. * */ -#define elf_read_implies_exec (ex, stk) (stk == EXSTACK_DEFAULT) +#define compat_elf_read_implies_exec (ex, stk) (stk == EXSTACK_DEFAULT)#define CORE_DUMP_USE_REGSET #define ELF_EXEC_PAGESIZE PAGE_SIZE
fs/compat_binfmt_elf.c +5 -0
@@ -113,6 +113,11 @@#define arch_setup_additional_pages compat_arch_setup_additional_pages#endif +#ifdef compat_elf_read_implies_exec +#undef elf_read_implies_exec +#define elf_read_implies_exec compat_elf_read_implies_exec +#endif +/* * Rename a few of the symbols that binfmt_elf.c will define. * These are all local so the names don't really matter, but it