From ec68c75c629eed149ed4416d5300328deb53a417 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Wed, 3 Nov 2021 20:00:26 +0200 Subject: [PATCH] kernel: add missing KASAN config symbols Enabling KERNEL_KASAN exposes several missing symbols. As KASAN_SW_TAGS is only implemented for arm64 CPUs and requires clang, it doesn't make sense to make this a build option so just default to KASAN_GENERIC and disable KASAN_SW_TAGS. While at it, disable TEST_KASAN_MODULE in the generic 5.10 config. Fixes build failures with KERNEL_KASAN enabled. Signed-off-by: Stijn Tintel Acked-by: Hauke Mehrtens --- config/Config-kernel.in | 7 +++++++ target/linux/generic/config-5.10 | 1 + 2 files changed, 8 insertions(+) diff --git a/config/Config-kernel.in b/config/Config-kernel.in index dc249a6031..2243e3e5bc 100644 --- a/config/Config-kernel.in +++ b/config/Config-kernel.in @@ -147,6 +147,13 @@ config KERNEL_KASAN_EXTRA compile time. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81715 has more +if KERNEL_KASAN + config KERNEL_KASAN_GENERIC + def_bool y + + config KERNEL_KASAN_SW_TAGS + def_bool n +endif choice prompt "Instrumentation type" diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10 index 7b952e8ca8..403712d0e9 100644 --- a/target/linux/generic/config-5.10 +++ b/target/linux/generic/config-5.10 @@ -6064,6 +6064,7 @@ CONFIG_TCP_CONG_CUBIC=y # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_IDA is not set +# CONFIG_TEST_KASAN_MODULE is not set # CONFIG_TEST_KMOD is not set # CONFIG_TEST_KSTRTOX is not set # CONFIG_TEST_LIST_SORT is not set -- 2.30.2