hardening: Adjust dependencies in selection of MODVERSIONS

MODVERSIONS recently grew a dependency on !COMPILE_TEST so that Rust
could be more easily tested. However, this introduces a Kconfig warning
when building allmodconfig with a clang version that supports RANDSTRUCT
natively because RANDSTRUCT_FULL and RANDSTRUCT_PERFORMANCE select
MODVERSIONS when MODULES is enabled, bypassing the !COMPILE_TEST
dependency:

  WARNING: unmet direct dependencies detected for MODVERSIONS
    Depends on [n]: MODULES [=y] && !COMPILE_TEST [=y]
    Selected by [y]:
    - RANDSTRUCT_FULL [=y] && (CC_HAS_RANDSTRUCT [=y] || GCC_PLUGINS [=n]) && MODULES [=y]

Add the !COMPILE_TEST dependency to the selections to clear up the
warning.

Fixes: 1f9c4a9967 ("Kbuild: make MODVERSIONS support depend on not being a compile test build")
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Link: https://lore.kernel.org/r/20240928-fix-randstruct-modversions-kconfig-warning-v1-1-27d3edc8571e@kernel.org
Signed-off-by: Kees Cook <kees@kernel.org>
This commit is contained in:
Nathan Chancellor 2024-09-28 11:13:13 -07:00 committed by Kees Cook
parent 886d518ca9
commit dd3a7ee91e

View File

@ -340,7 +340,7 @@ choice
config RANDSTRUCT_FULL config RANDSTRUCT_FULL
bool "Fully randomize structure layout" bool "Fully randomize structure layout"
depends on CC_HAS_RANDSTRUCT || GCC_PLUGINS depends on CC_HAS_RANDSTRUCT || GCC_PLUGINS
select MODVERSIONS if MODULES select MODVERSIONS if MODULES && !COMPILE_TEST
help help
Fully randomize the member layout of sensitive Fully randomize the member layout of sensitive
structures as much as possible, which may have both a structures as much as possible, which may have both a
@ -356,7 +356,7 @@ choice
config RANDSTRUCT_PERFORMANCE config RANDSTRUCT_PERFORMANCE
bool "Limit randomization of structure layout to cache-lines" bool "Limit randomization of structure layout to cache-lines"
depends on GCC_PLUGINS depends on GCC_PLUGINS
select MODVERSIONS if MODULES select MODVERSIONS if MODULES && !COMPILE_TEST
help help
Randomization of sensitive kernel structures will make a Randomization of sensitive kernel structures will make a
best effort at restricting randomization to cacheline-sized best effort at restricting randomization to cacheline-sized