x86/head/64: Avoid Clang < 17 stack protector in startup code
PATCH 1/1 x86/head/64: Avoid Clang < 17 stack protector in startup code
From: Ard Biesheuvel <[email protected]>
Clang versions before 17 will not honour -fdirect-access-external-data for the load of the stack cookie emitted into each function's prologue and epilogue, and will emit a GOT based reference instead, e.g.,
4c 8b 2d 00 00 00 00 mov 0x0(%rip),%r13
18a: R_X86_64_REX_GOTPCRELX __ref_stack_chk_guard-0x4
65 49 8b 45 00 mov %gs:0x0(%r13),%rax
This is inefficient, but at least, the linker will usually follow the rules of the x86 psABI, and relax the GOT load into a RIP-relative LEA instruction. This is still suboptimal, as the per-CPU load could use a RIP-relative reference directly, but at least it gets rid of the first load from memory.
However, Boris reports that in some cases, when using distro builds of Clang/LLD 15, the first load gets relaxed into
49 c7 c6 20 c0 55 86 mov $0xffffffff8655c020,%r14
ffffffff8373bf0f: R_X86_64_32S __ref_stack_chk_guard
65 49 8b 06 mov %gs:(%r14),%rax
instead, which is fine in principle, as MOV may be cheaper than LEA on some micro-architectures. However, such absolute references assume that the variable in question can be accessed via the kernel virtual mapping, and this is not guaranteed for the startup code residing in .head.text.
This is therefore a true positive, that was caught using the recently introduced relocs check for absolute references in the startup code:
Absolute reference to symbol '__ref_stack_chk_guard' not permitted in .head.text
Work around the issue by disabling the stack protector in the startup code for Clang versions older than 17.
--- arch/x86/include/asm/init.h | 4 ++++ 1 file changed, 4 insertions(+)
arch/x86/include/asm/init.h +4 -0
@@ -2,7 +2,11 @@ #ifndef _ASM_X86_INIT_H #define _ASM_X86_INIT_H +#if defined(CONFIG_CC_IS_CLANG) && CONFIG_CLANG_VERSION < 170000 +#define __head __section(".head.text") __no_sanitize_undefined __no_stack_protector +#else #define __head __section(".head.text") __no_sanitize_undefined +#endif struct x86_mapping_info { void *(*alloc_pgt_page)(void *); /* allocate buf for page table */
Signature · 1 line
2.49.0.rc0.332.g42c0ae87b1-goog
Quoted 50 lines · Ard Biesheuvel
From: Ard Biesheuvel <[email protected]>
Clang versions before 17 will not honour -fdirect-access-external-data for the load of the stack cookie emitted into each function's prologue and epilogue, and will emit a GOT based reference instead, e.g.,
4c 8b 2d 00 00 00 00 mov 0x0(%rip),%r13
18a: R_X86_64_REX_GOTPCRELX __ref_stack_chk_guard-0x465 49 8b 45 00 mov %gs:0x0(%r13),%rax
This is inefficient, but at least, the linker will usually follow the rules of the x86 psABI, and relax the GOT load into a RIP-relative LEA instruction. This is still suboptimal, as the per-CPU load could use a RIP-relative reference directly, but at least it gets rid of the first load from memory.
However, Boris reports that in some cases, when using distro builds of Clang/LLD 15, the first load gets relaxed into
49 c7 c6 20 c0 55 86 mov $0xffffffff8655c020,%r14
ffffffff8373bf0f:R_X86_64_32S__ref_stack_chk_guard
65 49 8b 06 mov %gs:(%r14),%raxinstead, which is fine in principle, as MOV may be cheaper than LEA on some micro-architectures. However, such absolute references assume that the variable in question can be accessed via the kernel virtual mapping, and this is not guaranteed for the startup code residing in .head.text.
This is therefore a true positive, that was caught using the recently introduced relocs check for absolute references in the startup code:
Absolute reference to symbol '
__ref_stack_chk_guard' not permitted in .head.textWork around the issue by disabling the stack protector in the startup code for Clang versions older than 17.
Fixes 80d47defddc0 ("x86/stackprotector/64: Convert to normal per-CPU variable")Cc Borislav Petkov <[email protected]>Cc Brian Gerst <[email protected]>Signed-off-by Ard Biesheuvel <[email protected]>--- arch/x86/include/asm/init.h | 4 ++++ 1 file changed, 4 insertions(+)arch/x86/include/asm/init.h +0
-0
arch/x86/include/asm/init.h line 9
Quoted 8 lines
arch/x86/include/asm/init.h +4
-0@@ -2,7 +2,11 @@#ifndef _ASM_X86_INIT_H#define _ASM_X86_INIT_H +#if defined(CONFIG_CC_IS_CLANG ) &&CONFIG_CLANG_VERSION <170000 +#define __head __section(".head.text") __no_sanitize_undefined __no_stack_protector +#else #define __head __section(".head.text") __no_sanitize_undefined +#endif
Just disable it for all __head code. This runs long before userspace can mount a stack smashing attack.
Brian Gerst
Quoted 55 lines · Brian Gerst
Quoted 53 lines · Ard Biesheuvel
From: Ard Biesheuvel <[email protected]>
Clang versions before 17 will not honour -fdirect-access-external-data for the load of the stack cookie emitted into each function's prologue and epilogue, and will emit a GOT based reference instead, e.g.,
4c 8b 2d 00 00 00 00 mov 0x0(%rip),%r13
18a: R_X86_64_REX_GOTPCRELX __ref_stack_chk_guard-0x465 49 8b 45 00 mov %gs:0x0(%r13),%rax
This is inefficient, but at least, the linker will usually follow the rules of the x86 psABI, and relax the GOT load into a RIP-relative LEA instruction. This is still suboptimal, as the per-CPU load could use a RIP-relative reference directly, but at least it gets rid of the first load from memory.
However, Boris reports that in some cases, when using distro builds of Clang/LLD 15, the first load gets relaxed into
49 c7 c6 20 c0 55 86 mov $0xffffffff8655c020,%r14
ffffffff8373bf0f:R_X86_64_32S__ref_stack_chk_guard
65 49 8b 06 mov %gs:(%r14),%raxinstead, which is fine in principle, as MOV may be cheaper than LEA on some micro-architectures. However, such absolute references assume that the variable in question can be accessed via the kernel virtual mapping, and this is not guaranteed for the startup code residing in .head.text.
This is therefore a true positive, that was caught using the recently introduced relocs check for absolute references in the startup code:
Absolute reference to symbol '
__ref_stack_chk_guard' not permitted in .head.textWork around the issue by disabling the stack protector in the startup code for Clang versions older than 17.
Fixes 80d47defddc0 ("x86/stackprotector/64: Convert to normal per-CPU variable")Cc Borislav Petkov <[email protected]>Cc Brian Gerst <[email protected]>Signed-off-by Ard Biesheuvel <[email protected]>--- arch/x86/include/asm/init.h | 4 ++++ 1 file changed, 4 insertions(+)arch/x86/include/asm/init.h +0
-0@@ -2,7 +2,11 @@#ifndef _ASM_X86_INIT_H#define _ASM_X86_INIT_H
Quoted 9 lines
arch/x86/include/asm/init.h line 9
Quoted 5 lines
arch/x86/include/asm/init.h +4
-0+#if defined(CONFIG_CC_IS_CLANG ) &&CONFIG_CLANG_VERSION <170000 +#define __head __section(".head.text") __no_sanitize_undefined __no_stack_protector +#else #define __head __section(".head.text") __no_sanitize_undefined +#endif Just disable it for all
__headcode. This runs long before userspace can mount a stack smashing attack.
Not all of it - some code is emitted into .head.text because it is called early, but it could still be called much later as well.
The following commit has been merged into the x86/asm branch of tip:
The following commit has been merged into the x86/asm branch of tip:
Commit-ID: 857716c8249ea9ada9d5657062833b6b5ef9fd63 Gitweb: https://git.kernel.org/tip/857716c8249ea9ada9d5657062833b6b5ef9fd63 Author: Ard Biesheuvel <[email protected]> AuthorDate: Wed, 12 Mar 2025 11:27:41 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Wed, 12 Mar 2025 12:08:10 +01:00
x86/head/64: Avoid Clang < 17 stack protector in startup code
Clang versions before 17 will not honour -fdirect-access-external-data for the load of the stack cookie emitted into each function's prologue and epilogue, and will emit a GOT based reference instead, e.g.,
4c 8b 2d 00 00 00 00 mov 0x0(%rip),%r13
18a: R_X86_64_REX_GOTPCRELX __ref_stack_chk_guard-0x4
65 49 8b 45 00 mov %gs:0x0(%r13),%rax
This is inefficient, but at least, the linker will usually follow the rules of the x86 psABI, and relax the GOT load into a RIP-relative LEA instruction. This is still suboptimal, as the per-CPU load could use a RIP-relative reference directly, but at least it gets rid of the first load from memory.
However, Boris reports that in some cases, when using distro builds of Clang/LLD 15, the first load gets relaxed into
49 c7 c6 20 c0 55 86 mov $0xffffffff8655c020,%r14
ffffffff8373bf0f: R_X86_64_32S __ref_stack_chk_guard
65 49 8b 06 mov %gs:(%r14),%rax
instead, which is fine in principle, as MOV may be cheaper than LEA on some micro-architectures. However, such absolute references assume that the variable in question can be accessed via the kernel virtual mapping, and this is not guaranteed for the startup code residing in .head.text.
This is therefore a true positive, that was caught using the recently introduced relocs check for absolute references in the startup code:
Absolute reference to symbol '__ref_stack_chk_guard' not permitted in .head.text
Work around the issue by disabling the stack protector in the startup code for Clang versions older than 17.
--- arch/x86/include/asm/init.h | 4 ++++ 1 file changed, 4 insertions(+)
arch/x86/include/asm/init.h +4 -0
@@ -2,7 +2,11 @@ #ifndef _ASM_X86_INIT_H #define _ASM_X86_INIT_H +#if defined(CONFIG_CC_IS_CLANG) && CONFIG_CLANG_VERSION < 170000 +#define __head __section(".head.text") __no_sanitize_undefined __no_stack_protector +#else #define __head __section(".head.text") __no_sanitize_undefined +#endif struct x86_mapping_info { void *(*alloc_pgt_page)(void *); /* allocate buf for page table */
The following commit has been merged into the x86/core branch of tip:
The following commit has been merged into the x86/core branch of tip:
Commit-ID: 3f5dbafc2d4651020f45309ca85120b6a8162fd9 Gitweb: https://git.kernel.org/tip/3f5dbafc2d4651020f45309ca85120b6a8162fd9 Author: Ard Biesheuvel <[email protected]> AuthorDate: Wed, 12 Mar 2025 11:27:41 +01:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Wed, 19 Mar 2025 11:26:49 +01:00
x86/head/64: Avoid Clang < 17 stack protector in startup code
Clang versions before 17 will not honour -fdirect-access-external-data for the load of the stack cookie emitted into each function's prologue and epilogue, and will emit a GOT based reference instead, e.g.,
4c 8b 2d 00 00 00 00 mov 0x0(%rip),%r13
18a: R_X86_64_REX_GOTPCRELX __ref_stack_chk_guard-0x4
65 49 8b 45 00 mov %gs:0x0(%r13),%rax
This is inefficient, but at least, the linker will usually follow the rules of the x86 psABI, and relax the GOT load into a RIP-relative LEA instruction. This is still suboptimal, as the per-CPU load could use a RIP-relative reference directly, but at least it gets rid of the first load from memory.
However, Boris reports that in some cases, when using distro builds of Clang/LLD 15, the first load gets relaxed into
49 c7 c6 20 c0 55 86 mov $0xffffffff8655c020,%r14
ffffffff8373bf0f: R_X86_64_32S __ref_stack_chk_guard
65 49 8b 06 mov %gs:(%r14),%rax
instead, which is fine in principle, as MOV may be cheaper than LEA on some micro-architectures. However, such absolute references assume that the variable in question can be accessed via the kernel virtual mapping, and this is not guaranteed for the startup code residing in .head.text.
This is therefore a true positive, that was caught using the recently introduced relocs check for absolute references in the startup code:
Absolute reference to symbol '__ref_stack_chk_guard' not permitted in .head.text
Work around the issue by disabling the stack protector in the startup code for Clang versions older than 17.
--- arch/x86/include/asm/init.h | 4 ++++ 1 file changed, 4 insertions(+)
arch/x86/include/asm/init.h +4 -0
@@ -2,7 +2,11 @@ #ifndef _ASM_X86_INIT_H #define _ASM_X86_INIT_H +#if defined(CONFIG_CC_IS_CLANG) && CONFIG_CLANG_VERSION < 170000 +#define __head __section(".head.text") __no_sanitize_undefined __no_stack_protector +#else #define __head __section(".head.text") __no_sanitize_undefined +#endif struct x86_mapping_info { void *(*alloc_pgt_page)(void *); /* allocate buf for page table */