kasan-respect-config_kasan_vmalloc-for-kasan_flag_vmalloc.patch removed from -mm tree
The quilt patch titled
Subject: kasan: respect CONFIG_KASAN_VMALLOC for kasan_flag_vmalloc
has been removed from the -mm tree. Its filename was
kasan-respect-config_kasan_vmalloc-for-kasan_flag_vmalloc.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Andrey Konovalov <[email protected]>
Subject: kasan: respect CONFIG_KASAN_VMALLOC for kasan_flag_vmalloc
Date: Thu, 21 Dec 2023 21:04:49 +0100
Never enable the kasan_flag_vmalloc static branch unless CONFIG_KASAN_VMALLOC is enabled.
This does not fix any observable bugs (vmalloc annotations for the HW_TAGS mode are no-op with CONFIG_KASAN_VMALLOC disabled) but rather just cleans up the code.
---
mm/kasan/hw_tags.c | 7 +++++++ mm/kasan/kasan.h | 1 + 2 files changed, 8 insertions(+)
mm/kasan/hw_tags.c renamed from mm/kasan/hw_tags.c~kasan-respect-config_kasan_vmalloc-for-kasan_flag_vmalloc +7 -0
@@ -57,7 +57,11 @@ enum kasan_mode kasan_mode __ro_after_inEXPORT_SYMBOL_GPL (kasan_mode);/* Whether to enable vmalloc tagging. */ +#ifdef CONFIG_KASAN_VMALLOC DEFINE_STATIC_KEY_TRUE (kasan_flag_vmalloc); +#else +DEFINE_STATIC_KEY_FALSE (kasan_flag_vmalloc); +#endif #define PAGE_ALLOC_SAMPLE_DEFAULT 1#define PAGE_ALLOC_SAMPLE_ORDER_DEFAULT 3
@@ -119,6 +123,9 @@ static int __init early_kasan_flag_vmallif (!arg)return -EINVAL ; +if (!IS_ENABLED (CONFIG_KASAN_VMALLOC )) +return 0 ; +if (!strcmp (arg,"off" )) kasan_arg_vmalloc =KASAN_ARG_VMALLOC_OFF ;else if (!strcmp (arg,"on" ))
mm/kasan/kasan.h renamed from mm/kasan/kasan.h~kasan-respect-config_kasan_vmalloc-for-kasan_flag_vmalloc +1 -0
@@ -49,6 +49,7 @@ DECLARE_PER_CPU(long, kasan_page_alloc_sstatic inline bool kasan_vmalloc_enabled (void ) { +/* Static branch is never enabled with CONFIG_KASAN_VMALLOC disabled. */ return static_branch_likely (&kasan_flag_vmalloc); }
_
Patches currently in -mm which might be from [email protected] are
kasan-stop-leaking-stack-trace-handles.patch