With UBSAN_OBJECT_SIZE disabled for GCC, only UBSAN_ALIGNMENT remained
a noisy UBSAN option. Disable it for COMPILE_TEST so the rest of UBSAN
can be used for full all*config builds or other large combinations.

Link: 
https://lore.kernel.org/lkml/CAHk-=wgXW=ylxgn0qvpp-1w5gdd2pf1w-fqy15pokzovfik...@mail.gmail.com/
Signed-off-by: Kees Cook <keesc...@chromium.org>
---
 lib/Kconfig.ubsan | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/Kconfig.ubsan b/lib/Kconfig.ubsan
index 6e8b67d4b0d9..fa78f0f3c1dc 100644
--- a/lib/Kconfig.ubsan
+++ b/lib/Kconfig.ubsan
@@ -130,7 +130,6 @@ config UBSAN_ENUM
 config UBSAN_SANITIZE_ALL
        bool "Enable instrumentation for the entire kernel"
        depends on ARCH_HAS_UBSAN_SANITIZE_ALL
-       depends on !COMPILE_TEST
        default y
        help
          This option activates instrumentation for the entire kernel.
@@ -142,7 +141,7 @@ config UBSAN_SANITIZE_ALL
 config UBSAN_ALIGNMENT
        bool "Enable checks for pointers alignment"
        default !HAVE_EFFICIENT_UNALIGNED_ACCESS
-       depends on !UBSAN_TRAP
+       depends on !UBSAN_TRAP && !COMPILE_TEST
        depends on $(cc-option,-fsanitize=alignment)
        help
          This option enables the check of unaligned memory accesses.
-- 
2.25.1

Reply via email to