diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2021-11-03 20:00:26 +0200 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2021-11-07 17:26:47 +0200 |
| commit | ec68c75c629eed149ed4416d5300328deb53a417 (patch) | |
| tree | ce54d36593d872ca7d41a22013462c26c5bca8c0 | |
| parent | f2f42a54e8defb110a3e8b2aab833d67f27e2fe3 (diff) | |
| download | upstream-ec68c75c629eed149ed4416d5300328deb53a417.tar.gz upstream-ec68c75c629eed149ed4416d5300328deb53a417.tar.bz2 upstream-ec68c75c629eed149ed4416d5300328deb53a417.zip | |
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 <stijn@linux-ipv6.be>
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | config/Config-kernel.in | 7 | ||||
| -rw-r--r-- | target/linux/generic/config-5.10 | 1 |
2 files changed, 8 insertions, 0 deletions
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 |