Messages in this thread | | | From | Uros Bizjak <> | Date | Thu, 26 Oct 2023 19:59:14 +0200 | Subject | Re: [PATCH v2 01/11] x86/stackprotector/32: Remove stack protector test script |
| |
On Thu, Oct 26, 2023 at 6:01 PM Brian Gerst <brgerst@gmail.com> wrote: > > Test for compiler support directly in Kconfig. > > Signed-off-by: Brian Gerst <brgerst@gmail.com>
Reviewed-by: Uros Bizjak <ubizjak@gmail.com>
> --- > arch/x86/Kconfig | 2 +- > scripts/gcc-x86_32-has-stack-protector.sh | 8 -------- > 2 files changed, 1 insertion(+), 9 deletions(-) > delete mode 100755 scripts/gcc-x86_32-has-stack-protector.sh > > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index 5ef081aa12ac..039872be1630 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -411,7 +411,7 @@ config PGTABLE_LEVELS > config CC_HAS_SANE_STACKPROTECTOR > bool > default $(success,$(srctree)/scripts/gcc-x86_64-has-stack-protector.sh $(CC) $(CLANG_FLAGS)) if 64BIT > - default $(success,$(srctree)/scripts/gcc-x86_32-has-stack-protector.sh $(CC) $(CLANG_FLAGS)) > + default $(cc-option,-mstack-protector-guard-reg=fs -mstack-protector-guard-symbol=__stack_chk_guard) > help > We have to make sure stack protector is unconditionally disabled if > the compiler produces broken code or if it does not let us control > diff --git a/scripts/gcc-x86_32-has-stack-protector.sh b/scripts/gcc-x86_32-has-stack-protector.sh > deleted file mode 100755 > index 825c75c5b715..000000000000 > --- a/scripts/gcc-x86_32-has-stack-protector.sh > +++ /dev/null > @@ -1,8 +0,0 @@ > -#!/bin/sh > -# SPDX-License-Identifier: GPL-2.0 > - > -# This requires GCC 8.1 or better. Specifically, we require > -# -mstack-protector-guard-reg, added by > -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81708 > - > -echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -c -m32 -O0 -fstack-protector -mstack-protector-guard-reg=fs -mstack-protector-guard-symbol=__stack_chk_guard - -o - 2> /dev/null | grep -q "%fs" > -- > 2.41.0 >
| |