From: Brian Gerst <brgerst@gmail.com>
To: linux-kernel@vger.kernel.org, x86@kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Borislav Petkov <bp@alien8.de>, "H . Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Uros Bizjak <ubizjak@gmail.com>, Brian Gerst <brgerst@gmail.com>
Subject: [PATCH 1/9] x86/stackprotector/32: Remove stack protector test script
Date: Mon, 23 Oct 2023 17:17:22 -0400 [thread overview]
Message-ID: <20231023211730.40566-2-brgerst@gmail.com> (raw)
In-Reply-To: <20231023211730.40566-1-brgerst@gmail.com>
Test for compiler support directly in Kconfig.
Signed-off-by: Brian Gerst <brgerst@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
next prev parent reply other threads:[~2023-10-23 21:17 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-23 21:17 [PATCH 0/9] x86-64: Stack protector and percpu improvements Brian Gerst
2023-10-23 21:17 ` Brian Gerst [this message]
2023-10-23 21:17 ` [PATCH 2/9] x86/boot: Disable stack protector for early boot code Brian Gerst
2023-10-23 21:17 ` [PATCH 3/9] x86/stackprotector/64: Convert stack protector to normal percpu variable Brian Gerst
2023-10-24 12:39 ` Uros Bizjak
2023-10-23 21:17 ` [PATCH 4/9] x86/percpu/64: Remove fixed_percpu_data Brian Gerst
2023-10-24 12:33 ` Uros Bizjak
2023-10-24 14:11 ` Brian Gerst
2023-10-23 21:17 ` [PATCH 5/9] x86/percpu/64: Use relative percpu offsets Brian Gerst
2023-10-24 12:43 ` Uros Bizjak
2023-10-23 21:17 ` [PATCH 6/9] x86/boot/64: Remove inverse relocations Brian Gerst
2023-10-23 21:17 ` [PATCH 7/9] x86/percpu/64: Remove INIT_PER_CPU macros Brian Gerst
2023-10-23 21:17 ` [PATCH 8/9] percpu: Remove PER_CPU_FIRST_SECTION Brian Gerst
2023-10-23 21:17 ` [PATCH 9/9] kallsyms: Remove KALLSYMS_ABSOLUTE_PERCPU Brian Gerst
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231023211730.40566-2-brgerst@gmail.com \
--to=brgerst@gmail.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=ubizjak@gmail.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox