--- v4
+++ v3
@@ -1,28 +1,36 @@
-Call kasan_init_generic() which handles Generic KASAN initialization
-and prints the banner. Since xtensa doesn't select ARCH_DEFER_KASAN,
-kasan_enable() will be a no-op.
+Call kasan_init_generic() which handles Generic KASAN initialization.
+Since arm64 doesn't select ARCH_DEFER_KASAN, this will be a no-op for
+the runtime flag but will print the initialization banner.
-Note that arch/xtensa still uses "current" instead of "init_task" pointer
-in `current->kasan_depth = 0;` to enable error messages. This is left
-unchanged as it cannot be tested.
+For SW_TAGS and HW_TAGS modes, their respective init functions will
+handle the flag enabling.
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217049
Signed-off-by: Sabyrzhan Tasbolatov <snovitoll@gmail.com>
---
- arch/xtensa/mm/kasan_init.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ arch/arm64/mm/kasan_init.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
-diff --git a/arch/xtensa/mm/kasan_init.c b/arch/xtensa/mm/kasan_init.c
-index f39c4d83173..0524b9ed5e6 100644
---- a/arch/xtensa/mm/kasan_init.c
-+++ b/arch/xtensa/mm/kasan_init.c
-@@ -94,5 +94,5 @@ void __init kasan_init(void)
+diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c
+index d541ce45dae..abeb81bf6eb 100644
+--- a/arch/arm64/mm/kasan_init.c
++++ b/arch/arm64/mm/kasan_init.c
+@@ -399,14 +399,12 @@ void __init kasan_init(void)
+ {
+ kasan_init_shadow();
+ kasan_init_depth();
+-#if defined(CONFIG_KASAN_GENERIC)
++ kasan_init_generic();
+ /*
+ * Generic KASAN is now fully initialized.
+ * Software and Hardware Tag-Based modes still require
+ * kasan_init_sw_tags() and kasan_init_hw_tags() correspondingly.
+ */
+- pr_info("KernelAddressSanitizer initialized (generic)\n");
+-#endif
+ }
- /* At this point kasan is fully initialized. Enable error messages. */
- current->kasan_depth = 0;
-- pr_info("KernelAddressSanitizer initialized\n");
-+ kasan_init_generic();
- }
+ #endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */
--
2.34.1