3 files changed, 14 insertions, 1 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 1a1423923bcf..b66c264d4194 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -217,7 +217,7 @@ config ENABLE_MUST_CHECK
 config FRAME_WARN
         int "Warn for stack frames larger than (needs gcc 4.4)"
         range 0 8192
-        default 0 if KASAN
+        default 3072 if KASAN_EXTRA
         default 2048 if GCC_PLUGIN_LATENT_ENTROPY
         default 1280 if (!64BIT && PARISC)
         default 1024 if (!64BIT && !PARISC)
diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan
index bd38aab05929..3d35d062970d 100644
--- a/lib/Kconfig.kasan
+++ b/lib/Kconfig.kasan
@@ -20,6 +20,17 @@ config KASAN
           Currently CONFIG_KASAN doesn't work with CONFIG_DEBUG_SLAB
           (the resulting kernel does not boot).
 
+config KASAN_EXTRA
+        bool "KAsan: extra checks"
+        depends on KASAN && DEBUG_KERNEL && !COMPILE_TEST
+        help
+          This enables further checks in the kernel address sanitizer, for now
+          it only includes the address-use-after-scope check that can lead
+          to excessive kernel stack usage, frame size warnings and longer
+          compile time.
+          https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81715 has more
+
+
 choice
         prompt "Instrumentation type"
         depends on KASAN
diff --git a/scripts/Makefile.kasan b/scripts/Makefile.kasan
index 3fb382c69ff6..69552a39951d 100644
--- a/scripts/Makefile.kasan
+++ b/scripts/Makefile.kasan
@@ -38,7 +38,9 @@ else
 
 endif
 
+ifdef CONFIG_KASAN_EXTRA
 CFLAGS_KASAN += $(call cc-option, -fsanitize-address-use-after-scope)
+endif
 
 CFLAGS_KASAN_NOSANITIZE := -fno-builtin