Skip to content

Commit 5106c65

Browse files
Cydoxkees
authored andcommitted
hardening: simplify CONFIG_CC_HAS_COUNTED_BY
Simplifies CONFIG_CC_HAS_COUNTED_BY by removing the build test and relying solely on gcc/clang version numbering (GCC_VERSION >= 150100 and CLANG_VERSION >= 190103). The build test was used to allow unreleased gcc 15.0 builds to use the __counted_by attribute. Now that gcc 15.1.0 has been released, this is not needed anymore. Note: This will disable __counted_by on unreleased gcc 15.0 builds. clang version support for __counted_by remains unchanged. Link: https://lore.kernel.org/all/Zw8iawAF5W2uzGuh@archlinux/T/#m204c09f63c076586a02d194b87dffc7e81b8de7b Link: https://lore.kernel.org/r/[email protected] Suggested-by: Nathan Chancellor <[email protected]> Signed-off-by: Jan Hendrik Farr <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Nathan Chancellor <[email protected]> Signed-off-by: Kees Cook <[email protected]>
1 parent 47e36ed commit 5106c65

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

init/Kconfig

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,14 @@ config CC_HAS_NO_PROFILE_FN_ATTR
121121
def_bool $(success,echo '__attribute__((no_profile_instrument_function)) int x();' | $(CC) -x c - -c -o /dev/null -Werror)
122122

123123
config CC_HAS_COUNTED_BY
124-
# TODO: when gcc 15 is released remove the build test and add
125-
# a gcc version check
126-
def_bool $(success,echo 'struct flex { int count; int array[] __attribute__((__counted_by__(count))); };' | $(CC) $(CLANG_FLAGS) -x c - -c -o /dev/null -Werror)
124+
bool
127125
# clang needs to be at least 19.1.3 to avoid __bdos miscalculations
128126
# https://github.com/llvm/llvm-project/pull/110497
129127
# https://github.com/llvm/llvm-project/pull/112636
130-
depends on !(CC_IS_CLANG && CLANG_VERSION < 190103)
128+
default y if CC_IS_CLANG && CLANG_VERSION >= 190103
129+
# supported since gcc 15.1.0
130+
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108896
131+
default y if CC_IS_GCC && GCC_VERSION >= 150100
131132

132133
config CC_HAS_MULTIDIMENSIONAL_NONSTRING
133134
def_bool $(success,echo 'char tag[][4] __attribute__((__nonstring__)) = { };' | $(CC) $(CLANG_FLAGS) -x c - -c -o /dev/null -Werror)

0 commit comments

Comments
 (0)