From: Nathan Chancellor <nathan@kernel.org>
To: Ingo Molnar <mingo@kernel.org>, x86@kernel.org
Cc: Kees Cook <kees@kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
linux-kernel@vger.kernel.org
Subject: Semantic conflict around CONFIG_CFI_CLANG between Linus's tree and x86/core
Date: Fri, 3 Oct 2025 15:10:30 -0700 [thread overview]
Message-ID: <20251003221030.GA1162775@ax162> (raw)
Hi Ingo and other x86 folks,
Just a heads up, there will be a semantic conflict (for somewhat obvious
reasons) between
23ef9d439769 ("kcfi: Rename CONFIG_CFI_CLANG to CONFIG_CFI")
that went into Linus's tree via the hardening tree and
038c7dc66e27 ("compiler_types.h: Move __nocfi out of compiler-specific header")
which is currently in x86/core. I noticed this while kexec'ing under a
CFI kernel, which needs __nocfi as a result of
2114796ca041 ("x86/kexec: Mark machine_kexec() with __nocfi")
otherwise there is a nice big splat and the machine dies :)
Cheers,
Nathan
diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h
index 41c16fb8eb40..59288a2c1ad2 100644
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
@@ -455,7 +455,7 @@ struct ftrace_likely_data {
# define __noscs
#endif
-#if defined(CONFIG_CFI_CLANG)
+#if defined(CONFIG_CFI)
# define __nocfi __attribute__((__no_sanitize__("kcfi")))
#else
# define __nocfi
reply other threads:[~2025-10-03 22:10 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20251003221030.GA1162775@ax162 \
--to=nathan@kernel.org \
--cc=kees@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=torvalds@linux-foundation.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
all inboxes | Powered by JetHome®