start_kernel: omit stack canary
Subsystems (2)
v2 cover start_kernel: omit stack canary
A security research paper was recently published detailing Catch Handler Oriented Programming (CHOP) attacks.
https://download.vusec.net/papers/chop_ndss23.pdf
The TL;DR being that C++ structured exception handling runtimes are attractive gadgets for Jump Oriented Programming (JOP) attacks.
In response to this, a mitigation was developed under embargo in clang-16 to check the stack canary before calling noreturn functions.
https://bugs.chromium.org/p/llvm/issues/detail?id=30
This started causing boot failures in Android kernel trees downstream of stable linux-4.14.y that had proto-LTO support, as reported by Nathan Chancellor.
https://github.com/ClangBuiltLinux/linux/issues/1815
Josh Poimboeuf recently sent a series to explicitly annotate more functions as noreturn. Nathan noticed the series, and tested it finding that it now caused boot failures with clang-16+ on mainline (raising the visibility and urgency of the issue).
https://lore.kernel.org/[email protected]/
V2 of this series is rebased on tip/objtool/core @ 88b478ee5c7b080b70c68d6e9b3da6c2b518ceb0 now that that series has been picked up.
Once the embargo was lifted, I asked questions such as "what does C++ structured exception handling have to do with C code" and "surely GCC didn't ship the same mitigation for C code (narrator: 'They did not:
https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=a25982ada523689c8745d7fb4b1b93c8f5dab2e7')?"
I now have a patch out for LLVM to undo this mess (or at least limit it to C++ functions that may throw, similar to GCC's mitigation); it hasn't landed yet but we're close to consensus and I expect it to land imminently.
https://reviews.llvm.org/D147975
Remember this thread? (Pepperidge farms remembers...)
https://lore.kernel.org/all/[email protected]/
That reminded me that years ago we discussed a function attribute for no_stack_protector.
https://lore.kernel.org/all/[email protected]/
GCC didn't have one at the time, it now does. In addition to the LLVM fix, I'd like to introduce this in the kernel so that we might start using it in additional places:
* https://lore.kernel.org/linux-pm/[email protected]/
* https://lore.kernel.org/lkml/[email protected]/
And eventually remove the final macro expansion site of prevent_tail_call_optimization.
With the LLVM fix, this series isn't required, but I'd like to start paving the way to use these function attributes since I think they are a sweet spot in terms of granularity (as opposed to trying to move start_kernel to its own TU compiled with -fno-stack-protector).
---
Changes in v2:
- Rebase to avoid conflicts with Josh's changes.
- Fix comment style as per Peter.
- Pick up tags.
- Link to v1: https://lore.kernel.org/r/[email protected]
(sorry for the spam with v2, mrincon is helping me get kinks worked out with b4 and our corporate mailer)
---
Nick Desaulniers (2):
start_kernel: add no_stack_protector fn attr
start_kernel: omit prevent_tail_call_optimization for newer toolchains
arch/powerpc/kernel/smp.c | 1 + include/linux/compiler_attributes.h | 12 ++++++++++++ init/main.c | 9 ++++++++- 3 files changed, 21 insertions(+), 1 deletion(-)
---
base-commit: 88b478ee5c7b080b70c68d6e9b3da6c2b518ceb0
change-id: 20230412-no_stackp-a98168a2bb0a
Best regards,
Signature · 1 line
Nick Desaulniers <[email protected]>
PATCH v2 1/2 start_kernel: add no_stack_protector fn attr
Back during the discussion of
commit a9a3ed1eff36 ("x86: Fix early boot crash on gcc-10, third try") we discussed the need for a function attribute to control the omission of stack protectors on a per-function basis; at the time Clang had support for no_stack_protector but GCC did not. This was fixed in gcc-11. Now that the function attribute is available, let's start using it.
Callers of boot_init_stack_canary need to use this function attribute unless they're compiled with -fno-stack-protector, otherwise the canary stored in the stack slot of the caller will differ upon the call to boot_init_stack_canary. This will lead to a call to __stack_chk_fail then panic.
--- arch/powerpc/kernel/smp.c | 1 + include/linux/compiler_attributes.h | 12 ++++++++++++ init/main.c | 3 ++- 3 files changed, 15 insertions(+), 1 deletion(-)
arch/powerpc/kernel/smp.c +1 -0
@@ -1603,6 +1603,7 @@ static void add_cpu_to_masks(int cpu) }/* Activate a secondary processor. */ +__no_stack_protector void start_secondary(void *unused) {unsigned int cpu =raw_smp_processor_id ();
include/linux/compiler_attributes.h +12 -0
@@ -255,6 +255,18 @@*/ #define __noreturn __attribute__((__noreturn__)) +/* +* Optional: only supported since GCC >= 11.1, clang >= 7.0. +* +* gcc: https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-no_005fstack_005fprotector-function-attribute +* clang: https://clang.llvm.org/docs/AttributeReference.html#no-stack-protector-safebuffers +*/ +#if __has_attribute (__no_stack_protector__) +# define __no_stack_protector __attribute__((__no_stack_protector__)) +#else +# define __no_stack_protector +#endif +/* * Optional: not supported by gcc. *
init/main.c +2 -1
@@ -941,7 +941,8 @@ static void __init print_unknown_bootoptions(void)memblock_free (unknown_options, len); } -asmlinkage __visible void __init __no_sanitize_address __noreturn start_kernel(void) +asmlinkage __visible __init __no_sanitize_address __noreturn __no_stack_protector +void start_kernel (void ) {char *command_line;char *after_dashes;
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
[tip: objtool/core] start_kernel: Add __no_stack_protector function attribute
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 514ca14ed5444b911de59ed3381dfd195d99fe4b Gitweb: https://git.kernel.org/tip/514ca14ed5444b911de59ed3381dfd195d99fe4b Author: [email protected] <[email protected]> AuthorDate: Mon, 17 Apr 2023 15:00:05 -07:00 Committer: Josh Poimboeuf <[email protected]> CommitterDate: Tue, 16 May 2023 06:28:15 -07:00
start_kernel: Add __no_stack_protector function attribute
Back during the discussion of
commit a9a3ed1eff36 ("x86: Fix early boot crash on gcc-10, third try") we discussed the need for a function attribute to control the omission of stack protectors on a per-function basis; at the time Clang had support for no_stack_protector but GCC did not. This was fixed in gcc-11. Now that the function attribute is available, let's start using it.
Callers of boot_init_stack_canary need to use this function attribute unless they're compiled with -fno-stack-protector, otherwise the canary stored in the stack slot of the caller will differ upon the call to boot_init_stack_canary. This will lead to a call to __stack_chk_fail() then panic.
--- arch/powerpc/kernel/smp.c | 1 + include/linux/compiler_attributes.h | 12 ++++++++++++ init/main.c | 3 ++- 3 files changed, 15 insertions(+), 1 deletion(-)
arch/powerpc/kernel/smp.c +1 -0
@@ -1605,6 +1605,7 @@ static void add_cpu_to_masks(int cpu) }/* Activate a secondary processor. */ +__no_stack_protector void start_secondary(void *unused) {unsigned int cpu =raw_smp_processor_id ();
include/linux/compiler_attributes.h +12 -0
@@ -256,6 +256,18 @@#define __noreturn __attribute__((__noreturn__))/* +* Optional: only supported since GCC >= 11.1, clang >= 7.0. +* +* gcc: https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-no_005fstack_005fprotector-function-attribute +* clang: https://clang.llvm.org/docs/AttributeReference.html#no-stack-protector-safebuffers +*/ +#if __has_attribute (__no_stack_protector__) +# define __no_stack_protector __attribute__((__no_stack_protector__)) +#else +# define __no_stack_protector +#endif + +/* * Optional: not supported by gcc. * * clang: https://clang.llvm.org/docs/AttributeReference.html#overloadable
init/main.c +2 -1
@@ -877,7 +877,8 @@ static void __init print_unknown_bootoptions(void)memblock_free (unknown_options, len); } -asmlinkage __visible void __init __no_sanitize_address __noreturn start_kernel(void) +asmlinkage __visible __init __no_sanitize_address __noreturn __no_stack_protector +void start_kernel (void ) {char *command_line;char *after_dashes;
Re: [tip: objtool/core] start_kernel: Add __no_stack_protector function attribute
Quoted 7 lines · On Thu, May 18, 2023 at 11:08:03AM -0000, tip-bot2 for [email protected]…
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 514ca14ed5444b911de59ed3381dfd195d99fe4b Gitweb: https://git.kernel.org/tip/514ca14ed5444b911de59ed3381dfd195d99fe4b Author: [email protected] <[email protected]> AuthorDate: Mon, 17 Apr 2023 15:00:05 -07:00 Committer: Josh Poimboeuf <[email protected]>
Hi Nick, Josh, Peter,
Do you have an ETA for when this will make its way to Linus' tree? clang-17 built kernels have failed to boot since [0], so it would be nice to get this in sooner rather than later if possible.
Thanks,
David
Re: [tip: objtool/core] start_kernel: Add __no_stack_protector function attribute
Quoted 10 lines · David Vernet
Quoted 7 lines · On Thu, May 18, 2023 at 11:08:03AM -0000, tip-bot2 for [email protected]…
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 514ca14ed5444b911de59ed3381dfd195d99fe4b Gitweb: https://git.kernel.org/tip/514ca14ed5444b911de59ed3381dfd195d99fe4b Author: [email protected] <[email protected]> AuthorDate: Mon, 17 Apr 2023 15:00:05 -07:00 Committer: Josh Poimboeuf <[email protected]>
Quoted 5 lines
Hi Nick, Josh, Peter,
Do you have an ETA for when this will make its way to Linus' tree? clang-17 built kernels have failed to boot since [0], so it would be nice to get this in sooner rather than later if possible.
David,
Can you confirm that your version of clang-17 is updated? clang-17 is unreleased; ToT will become clang-17.
https://reviews.llvm.org/rGfc4494dffa5422b2be5442c235554e76bed79c8a
should have fixed any boot failures related to stack protectors. That is to say that Josh's series is irrelevant to anyone using either an existing release of clang, or something closer to ToT than April 13.
LLVM commit fc4494dffa54 ("[StackProtector] don't check stack protector before calling nounwind functions")
landed April 13, so please check that your build of clang-17 is after that date.
Either way, thanks for testing with clang, and the report. You can always file a bug at our issue tracker:
https://github.com/ClangBuiltLinux/linux/issues or see our page for more ways to get in touch:
https://clangbuiltlinux.github.io/
We're very active on our mailing list, and on IRC.
Quoted 5 lines
Thanks,
David
Signature · 2 lines
Thanks, ~Nick Desaulniers
Re: [tip: objtool/core] start_kernel: Add __no_stack_protector function attribute
Quoted 17 lines · Nick Desaulniers
Quoted 10 lines · David Vernet
Quoted 7 lines · On Thu, May 18, 2023 at 11:08:03AM -0000, tip-bot2 for [email protected]…
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 514ca14ed5444b911de59ed3381dfd195d99fe4b Gitweb: https://git.kernel.org/tip/514ca14ed5444b911de59ed3381dfd195d99fe4b Author: [email protected] <[email protected]> AuthorDate: Mon, 17 Apr 2023 15:00:05 -07:00 Committer: Josh Poimboeuf <[email protected]>Quoted 5 lines
Hi Nick, Josh, Peter,
Do you have an ETA for when this will make its way to Linus' tree? clang-17 built kernels have failed to boot since [0], so it would be nice to get this in sooner rather than later if possible.
Quoted 8 lines
David,
Can you confirm that your version of clang-17 is updated? clang-17 is unreleased; ToT will become clang-17.https://reviews.llvm.org/rGfc4494dffa5422b2be5442c235554e76bed79c8a
should have fixed any boot failures related to stack protectors. That is to say that Josh's series is irrelevant to anyone using either an existing release of clang, or something closer to ToT than April 13.
Thanks for the quick reply, Nick. The latest clang-17 does indeed fix the issue. Apologies for not trying that first -- I was using the only tagged verson of clang-17 (which admittedly is not a released version), and figured it wasn't a compiler bug given that the assembly looked sane, compilers are allowed to do all sorts of interesting things with __noreturn, and that [1] removes -fstack-protector from start_kernel() altogether.
[1]: https://lore.kernel.org/lkml/[email protected]/
Quoted 10 lines
LLVM commit
fc4494dffa54("[StackProtector] don't check stack protector before calling nounwind functions")
landed April 13, so please check that your build of clang-17 is after that date.Either way, thanks for testing with clang, and the report. You can always file a bug at our issue tracker:
https://github.com/ClangBuiltLinux/linux/issues or see our page for more ways to get in touch:
https://clangbuiltlinux.github.io/
We're very active on our mailing list, and on IRC.
Ack, thanks for letting me know for next time.
- David
PATCH v2 2/2 start_kernel: omit prevent_tail_call_optimization for newer toolchains
In reply to [email protected]prevent_tail_call_optimization was added in
commit a9a3ed1eff36 ("x86: Fix early boot crash on gcc-10, third try") to work around stack canaries getting inserted into functions that would initialize the stack canary in the first place.
Now that we have no_stack_protector function attribute (gcc-11+, clang-7+) and use it on start_kernel, remove the call to prevent_tail_call_optimization such that we may one day remove it outright.
--- init/main.c | 6 ++++++ 1 file changed, 6 insertions(+)
init/main.c +6 -0
@@ -1152,7 +1152,13 @@ void start_kernel(void)/* Do the rest non-__init'ed, we're now alive */ arch_call_rest_init (); +/* +* Avoid stack canaries in callers of boot_init_stack_canary for gcc-10 +* and older. +*/ +#if !__has_attribute (__no_stack_protector__)prevent_tail_call_optimization (); +#endif }/* Call all constructor functions linked into the kernel. */
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
[tip: objtool/core] start_kernel: Omit prevent_tail_call_optimization() for newer toolchains
The following commit has been merged into the objtool/core branch of tip:
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: dc1d05536f44cee16e46e86316e6718b2c0d8872 Gitweb: https://git.kernel.org/tip/dc1d05536f44cee16e46e86316e6718b2c0d8872 Author: [email protected] <[email protected]> AuthorDate: Mon, 17 Apr 2023 15:00:06 -07:00 Committer: Josh Poimboeuf <[email protected]> CommitterDate: Tue, 16 May 2023 06:28:24 -07:00
start_kernel: Omit prevent_tail_call_optimization() for newer toolchains
prevent_tail_call_optimization() was added in
commit a9a3ed1eff36 ("x86: Fix early boot crash on gcc-10, third try") to work around stack canaries getting inserted into functions that would initialize the stack canary in the first place.
Now that we have no_stack_protector function attribute (gcc-11+, clang-7+) and use it on start_kernel(), remove the call to prevent_tail_call_optimization() such that we may one day remove it outright.
--- init/main.c | 6 ++++++ 1 file changed, 6 insertions(+)
init/main.c +6 -0
@@ -1088,7 +1088,13 @@ void start_kernel(void)/* Do the rest non-__init'ed, we're now alive */ arch_call_rest_init (); +/* +* Avoid stack canaries in callers of boot_init_stack_canary for gcc-10 +* and older. +*/ +#if !__has_attribute (__no_stack_protector__)prevent_tail_call_optimization (); +#endif }/* Call all constructor functions linked into the kernel. */
Quoted 8 lines · On Mon, Apr 17, 2023 at 03:00:04PM -0700, [email protected] wrote:
---
Changes in v2:
- Rebase to avoid conflicts with Josh's changes.
- Fix comment style as per Peter.
- Pick up tags.
- Link to v1: https://lore.kernel.org/r/[email protected]
(sorry for the spam with v2, mrincon is helping me get kinks worked out with b4 and our corporate mailer)
Signature · 1 line
Josh