* [PATCH] tools headers: kcfi: rename missed CONFIG_CFI_CLANG
@ 2025-10-06 18:43 Carlos Llamas
2025-10-06 22:05 ` Nathan Chancellor
0 siblings, 1 reply; 5+ messages in thread
From: Carlos Llamas @ 2025-10-06 18:43 UTC (permalink / raw)
To: Namhyung Kim, Linus Walleij, Kees Cook, Nathan Chancellor,
Ingo Molnar, Carlos Llamas
Cc: kernel-team, linux-kernel
Commit 23ef9d439769 ("kcfi: Rename CONFIG_CFI_CLANG to CONFIG_CFI")
missed one instance of CONFIG_CFI_CLANG. Rename it to match the original
kernel header. This addresses the following build warning:
Warning: Kernel ABI header differences:
diff -u tools/include/linux/cfi_types.h include/linux/cfi_types.h
Cc: Kees Cook <kees@kernel.org>
Fixes: 23ef9d439769 ("kcfi: Rename CONFIG_CFI_CLANG to CONFIG_CFI")
Signed-off-by: Carlos Llamas <cmllamas@google.com>
---
tools/include/linux/cfi_types.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/include/linux/cfi_types.h b/tools/include/linux/cfi_types.h
index fb8d90bff92e..a86af9bc8bdc 100644
--- a/tools/include/linux/cfi_types.h
+++ b/tools/include/linux/cfi_types.h
@@ -43,7 +43,7 @@
#else /* __ASSEMBLY__ */
-#ifdef CONFIG_CFI_CLANG
+#ifdef CONFIG_CFI
#define DEFINE_CFI_TYPE(name, func) \
/* \
* Force a reference to the function so the compiler generates \
--
2.51.0.618.g983fd99d29-goog
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] tools headers: kcfi: rename missed CONFIG_CFI_CLANG
2025-10-06 18:43 [PATCH] tools headers: kcfi: rename missed CONFIG_CFI_CLANG Carlos Llamas
@ 2025-10-06 22:05 ` Nathan Chancellor
2025-10-06 22:46 ` Carlos Llamas
2025-10-06 22:51 ` [PATCH v2] " Carlos Llamas
0 siblings, 2 replies; 5+ messages in thread
From: Nathan Chancellor @ 2025-10-06 22:05 UTC (permalink / raw)
To: Carlos Llamas
Cc: Namhyung Kim, Linus Walleij, Kees Cook, Ingo Molnar, kernel-team,
linux-kernel
On Mon, Oct 06, 2025 at 06:43:57PM +0000, Carlos Llamas wrote:
> Commit 23ef9d439769 ("kcfi: Rename CONFIG_CFI_CLANG to CONFIG_CFI")
> missed one instance of CONFIG_CFI_CLANG. Rename it to match the original
Technically, this was correct when 23ef9d439769 committed:
$ git show 23ef9d439769:tools/include/linux/cfi_types.h | grep CONFIG_CFI
#ifdef CONFIG_CFI
#else /* CONFIG_CFI */
#endif /* CONFIG_CFI */
This is a cross tree collision, as
aa34642f6fc3 ("tools headers: Sync linux/cfi_types.h with the kernel source")
was merged in 6.17-rc4 via the perf tools tree but Kees's tree was based
on -rc2, so he did not have it. It only becomes a problem on the merge.
> kernel header. This addresses the following build warning:
>
> Warning: Kernel ABI header differences:
> diff -u tools/include/linux/cfi_types.h include/linux/cfi_types.h
>
> Cc: Kees Cook <kees@kernel.org>
> Fixes: 23ef9d439769 ("kcfi: Rename CONFIG_CFI_CLANG to CONFIG_CFI")
With all that said, I think this fixes tag should really be:
Fixes: a5ba183bdeee ("Merge tag 'hardening-v6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux")
> Signed-off-by: Carlos Llamas <cmllamas@google.com>
Regardless, I think the fix is obviously correct.
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
> ---
> tools/include/linux/cfi_types.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/include/linux/cfi_types.h b/tools/include/linux/cfi_types.h
> index fb8d90bff92e..a86af9bc8bdc 100644
> --- a/tools/include/linux/cfi_types.h
> +++ b/tools/include/linux/cfi_types.h
> @@ -43,7 +43,7 @@
>
> #else /* __ASSEMBLY__ */
>
> -#ifdef CONFIG_CFI_CLANG
> +#ifdef CONFIG_CFI
> #define DEFINE_CFI_TYPE(name, func) \
> /* \
> * Force a reference to the function so the compiler generates \
> --
> 2.51.0.618.g983fd99d29-goog
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] tools headers: kcfi: rename missed CONFIG_CFI_CLANG
2025-10-06 22:05 ` Nathan Chancellor
@ 2025-10-06 22:46 ` Carlos Llamas
2025-10-06 22:51 ` [PATCH v2] " Carlos Llamas
1 sibling, 0 replies; 5+ messages in thread
From: Carlos Llamas @ 2025-10-06 22:46 UTC (permalink / raw)
To: Nathan Chancellor
Cc: Namhyung Kim, Linus Walleij, Kees Cook, Ingo Molnar, kernel-team,
linux-kernel
On Mon, Oct 06, 2025 at 03:05:00PM -0700, Nathan Chancellor wrote:
> On Mon, Oct 06, 2025 at 06:43:57PM +0000, Carlos Llamas wrote:
> > Commit 23ef9d439769 ("kcfi: Rename CONFIG_CFI_CLANG to CONFIG_CFI")
> > missed one instance of CONFIG_CFI_CLANG. Rename it to match the original
>
> Technically, this was correct when 23ef9d439769 committed:
>
> $ git show 23ef9d439769:tools/include/linux/cfi_types.h | grep CONFIG_CFI
> #ifdef CONFIG_CFI
> #else /* CONFIG_CFI */
> #endif /* CONFIG_CFI */
>
> This is a cross tree collision, as
>
> aa34642f6fc3 ("tools headers: Sync linux/cfi_types.h with the kernel source")
>
> was merged in 6.17-rc4 via the perf tools tree but Kees's tree was based
> on -rc2, so he did not have it. It only becomes a problem on the merge.
>
Ha! Excellent detective skills. I totally missed this.
> > kernel header. This addresses the following build warning:
> >
> > Warning: Kernel ABI header differences:
> > diff -u tools/include/linux/cfi_types.h include/linux/cfi_types.h
> >
> > Cc: Kees Cook <kees@kernel.org>
> > Fixes: 23ef9d439769 ("kcfi: Rename CONFIG_CFI_CLANG to CONFIG_CFI")
>
> With all that said, I think this fixes tag should really be:
>
> Fixes: a5ba183bdeee ("Merge tag 'hardening-v6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux")
I'll swap the fixes tag for v2 as suggested, thanks!
>
> > Signed-off-by: Carlos Llamas <cmllamas@google.com>
>
> Regardless, I think the fix is obviously correct.
>
> Reviewed-by: Nathan Chancellor <nathan@kernel.org>
>
> > ---
> > tools/include/linux/cfi_types.h | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tools/include/linux/cfi_types.h b/tools/include/linux/cfi_types.h
> > index fb8d90bff92e..a86af9bc8bdc 100644
> > --- a/tools/include/linux/cfi_types.h
> > +++ b/tools/include/linux/cfi_types.h
> > @@ -43,7 +43,7 @@
> >
> > #else /* __ASSEMBLY__ */
> >
> > -#ifdef CONFIG_CFI_CLANG
> > +#ifdef CONFIG_CFI
> > #define DEFINE_CFI_TYPE(name, func) \
> > /* \
> > * Force a reference to the function so the compiler generates \
> > --
> > 2.51.0.618.g983fd99d29-goog
> >
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] tools headers: kcfi: rename missed CONFIG_CFI_CLANG
2025-10-06 22:05 ` Nathan Chancellor
2025-10-06 22:46 ` Carlos Llamas
@ 2025-10-06 22:51 ` Carlos Llamas
2025-10-07 15:24 ` (subset) " Kees Cook
1 sibling, 1 reply; 5+ messages in thread
From: Carlos Llamas @ 2025-10-06 22:51 UTC (permalink / raw)
To: Nathan Chancellor, Namhyung Kim, Ingo Molnar, Linus Walleij,
Kees Cook, Carlos Llamas
Cc: kernel-team, linux-kernel
Commit 23ef9d439769 ("kcfi: Rename CONFIG_CFI_CLANG to CONFIG_CFI")
missed one instance of CONFIG_CFI_CLANG. Rename it to match the original
kernel header. This addresses the following build warning:
Warning: Kernel ABI header differences:
diff -u tools/include/linux/cfi_types.h include/linux/cfi_types.h
Cc: Kees Cook <kees@kernel.org>
Fixes: a5ba183bdeee ("Merge tag 'hardening-v6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux")
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Carlos Llamas <cmllamas@google.com>
---
v2:
- Tag the correct fixes commit per Nathan.
- Collect reviewed tags.
v1:
https://lore.kernel.org/all/20251006184412.552339-1-cmllamas@google.com/
tools/include/linux/cfi_types.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/include/linux/cfi_types.h b/tools/include/linux/cfi_types.h
index fb8d90bff92e..a86af9bc8bdc 100644
--- a/tools/include/linux/cfi_types.h
+++ b/tools/include/linux/cfi_types.h
@@ -43,7 +43,7 @@
#else /* __ASSEMBLY__ */
-#ifdef CONFIG_CFI_CLANG
+#ifdef CONFIG_CFI
#define DEFINE_CFI_TYPE(name, func) \
/* \
* Force a reference to the function so the compiler generates \
--
2.51.0.618.g983fd99d29-goog
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: (subset) [PATCH v2] tools headers: kcfi: rename missed CONFIG_CFI_CLANG
2025-10-06 22:51 ` [PATCH v2] " Carlos Llamas
@ 2025-10-07 15:24 ` Kees Cook
0 siblings, 0 replies; 5+ messages in thread
From: Kees Cook @ 2025-10-07 15:24 UTC (permalink / raw)
To: Nathan Chancellor, Namhyung Kim, Ingo Molnar, Linus Walleij,
Carlos Llamas
Cc: Kees Cook, kernel-team, linux-kernel
On Mon, 06 Oct 2025 22:51:32 +0000, Carlos Llamas wrote:
> Commit 23ef9d439769 ("kcfi: Rename CONFIG_CFI_CLANG to CONFIG_CFI")
> missed one instance of CONFIG_CFI_CLANG. Rename it to match the original
> kernel header. This addresses the following build warning:
>
> Warning: Kernel ABI header differences:
> diff -u tools/include/linux/cfi_types.h include/linux/cfi_types.h
>
> [...]
Applied to for-next/hardening, thanks!
[1/1] tools headers: kcfi: rename missed CONFIG_CFI_CLANG
https://git.kernel.org/kees/c/b157dd228cf0
Take care,
--
Kees Cook
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-10-07 15:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-10-06 18:43 [PATCH] tools headers: kcfi: rename missed CONFIG_CFI_CLANG Carlos Llamas
2025-10-06 22:05 ` Nathan Chancellor
2025-10-06 22:46 ` Carlos Llamas
2025-10-06 22:51 ` [PATCH v2] " Carlos Llamas
2025-10-07 15:24 ` (subset) " Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox