From: Nathan Chancellor <nathan@kernel.org>
To: Peter Zijlstra <peterz@infradead.org>, x86@kernel.org
Cc: Nick Desaulniers <ndesaulniers@google.com>,
linux-kernel@vger.kernel.org, llvm@lists.linux.dev,
Nathan Chancellor <nathan@kernel.org>
Subject: [PATCH] x86/ibt: Fix CC_HAS_IBT check for clang
Date: Fri, 11 Mar 2022 12:56:42 -0700 [thread overview]
Message-ID: <20220311195642.2033108-1-nathan@kernel.org> (raw)
Commit 41c5ef31ad71 ("x86/ibt: Base IBT bits") added a check for a crash
in clang. However, this check does not work for two reasons.
The first reason is that '-pg' is missing from the check, which is
required for '-mfentry' to do anything.
The second reason is that cc-option only uses /dev/null as the input
file, which does not show a problem:
$ clang --version | head -1
Ubuntu clang version 12.0.1-8build1
$ clang -fcf-protection=branch -mfentry -pg -c -x c /dev/null -o /dev/null
$ echo $?
0
$ echo "void a(void) {}" | clang -fcf-protection=branch -mfentry -pg -c -x c - -o /dev/null
...
$ echo $?
139
Use this test instead so that the check works for older versions of
clang.
Fixes: 41c5ef31ad71 ("x86/ibt: Base IBT bits")
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
---
arch/x86/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 4ca7bfe927b3..870e0d10452d 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1867,7 +1867,7 @@ config CC_HAS_IBT
# Clang/LLVM >= 14
# fentry check to work around https://reviews.llvm.org/D111108
def_bool ((CC_IS_GCC && $(cc-option, -fcf-protection=branch -mindirect-branch-register)) || \
- (CC_IS_CLANG && $(cc-option, -fcf-protection=branch -mfentry))) && \
+ (CC_IS_CLANG && $(success,echo "void a(void) {}" | $(CC) -Werror $(CLANG_FLAGS) -fcf-protection=branch -mfentry -pg -x c - -c -o /dev/null))) && \
$(as-instr,endbr64)
config X86_KERNEL_IBT
base-commit: 9e1db76f44de4d9439e48c9ef61e5d457395202b
--
2.35.1
next reply other threads:[~2022-03-11 19:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-11 19:56 Nathan Chancellor [this message]
2022-03-12 12:20 ` [PATCH] x86/ibt: Fix CC_HAS_IBT check for clang Peter Zijlstra
2022-03-12 12:37 ` [tip: x86/core] " tip-bot2 for Nathan Chancellor
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=20220311195642.2033108-1-nathan@kernel.org \
--to=nathan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=ndesaulniers@google.com \
--cc=peterz@infradead.org \
--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