aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/kern/subr_asan.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/kern/subr_asan.c b/sys/kern/subr_asan.c
index 44c96435a499..c3664d9cf6c2 100644
--- a/sys/kern/subr_asan.c
+++ b/sys/kern/subr_asan.c
@@ -92,7 +92,10 @@ SYSCTL_INT(_debug_kasan, OID_AUTO, panic_on_violation, CTLFLAG_RDTUN,
&panic_on_violation, 0,
"Panic if an invalid access is detected");
-static bool kasan_enabled __read_mostly = false;
+#define kasan_enabled (!kasan_disabled)
+static bool kasan_disabled __read_mostly = true;
+SYSCTL_BOOL(_debug_kasan, OID_AUTO, disabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH,
+ &kasan_disabled, 0, "KASAN is disabled");
/* -------------------------------------------------------------------------- */
@@ -136,7 +139,7 @@ kasan_init(void)
kasan_md_init();
/* Now officially enabled. */
- kasan_enabled = true;
+ kasan_disabled = false;
}
void
@@ -180,7 +183,7 @@ kasan_code_name(uint8_t code)
#define REPORT(f, ...) do { \
if (panic_on_violation) { \
- kasan_enabled = false; \
+ kasan_disabled = true; \
panic(f, __VA_ARGS__); \
} else { \
struct stack st; \