fix! kasan: add kasan_async_mode_enabled

Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
xairy · Feb 11, 2021 · 91354d34b30ceedbc1b6417f1ff253de90618a97 · 91354d3
1 parent 22cd50b
commit 91354d34b30ceedbc1b6417f1ff253de90618a97
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/lib/test_kasan.c b/lib/test_kasan.c
@@ -51,7 +51,7 @@ static int kasan_test_init(struct kunit *test)
 		kunit_err(test, "can't run KASAN tests with KASAN disabled");
 		return -1;
 	}
-	if (kasan_flag_async) {
+	if (kasan_async_mode_enabled()) {
 		kunit_err(test, "can't run KASAN tests in async mode");
 		return -1;
 	}

diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h
@@ -7,21 +7,37 @@
 #include <linux/stackdepot.h>
 
 #ifdef CONFIG_KASAN_HW_TAGS
+
 #include <linux/static_key.h>
+
 DECLARE_STATIC_KEY_FALSE(kasan_flag_stacktrace);
+extern bool kasan_flag_async __ro_after_init;
+
 static inline bool kasan_stack_collection_enabled(void)
 {
 	return static_branch_unlikely(&kasan_flag_stacktrace);
 }
+
+static inline bool kasan_async_mode_enabled(void)
+{
+	return kasan_flag_async;
+}
+
 #else
+
 static inline bool kasan_stack_collection_enabled(void)
 {
 	return true;
 }
+
+static inline bool kasan_async_mode_enabled(void)
+{
+	return false;
+}
+
 #endif
 
 extern bool kasan_flag_panic __ro_after_init;
-extern bool kasan_flag_async __ro_after_init;
 
 #if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)
 #define KASAN_GRANULE_SIZE	(1UL << KASAN_SHADOW_SCALE_SHIFT)

diff --git a/mm/kasan/report.c b/mm/kasan/report.c
@@ -87,7 +87,7 @@ static void start_report(unsigned long *flags)
 
 static void end_report(unsigned long *flags, unsigned long addr)
 {
-	if (!kasan_flag_async)
+	if (!kasan_async_mode_enabled())
 		trace_error_report_end(ERROR_DETECTOR_KASAN, addr);
 	pr_err("==================================================================\n");
 	add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);