diff options
Diffstat (limited to 'init')
| -rw-r--r-- | init/init_task.c | 9 | ||||
| -rw-r--r-- | init/main.c | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/init/init_task.c b/init/init_task.c index bd403ed3e418..de5db6de5211 100644 --- a/init/init_task.c +++ b/init/init_task.c @@ -162,6 +162,15 @@ struct task_struct init_task #ifdef CONFIG_KASAN .kasan_depth = 1, #endif +#ifdef CONFIG_KCSAN + .kcsan_ctx = { + .disable_count = 0, + .atomic_next = 0, + .atomic_nest_count = 0, + .in_flat_atomic = false, + .access_mask = 0, + }, +#endif #ifdef CONFIG_TRACE_IRQFLAGS .softirqs_enabled = 1, #endif diff --git a/init/main.c b/init/main.c index a48617f2e5e5..295aec3a1a7a 100644 --- a/init/main.c +++ b/init/main.c @@ -94,6 +94,7 @@ #include <linux/rodata_test.h> #include <linux/jump_label.h> #include <linux/mem_encrypt.h> +#include <linux/kcsan.h> #include <asm/io.h> #include <asm/bugs.h> @@ -998,6 +999,7 @@ asmlinkage __visible void __init start_kernel(void) acpi_subsystem_init(); arch_post_acpi_subsys_init(); sfi_init_late(); + kcsan_init(); /* Do the rest non-__init'ed, we're now alive */ arch_call_rest_init(); |