Re: [PATCH] tools headers: kcfi: rename missed CONFIG_CFI_CLANG

[Nathan Chancellor]

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@xxxxxxxxxx>
> 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@xxxxxxxxxx>

Regardless, I think the fix is obviously correct.

Reviewed-by: Nathan Chancellor <nathan@xxxxxxxxxx>

> ---
>  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
>