kasan-check-kasan_vmalloc_enabled-in-vmalloc-tests.patch removed from -mm tree
The quilt patch titled
Subject: kasan: check kasan_vmalloc_enabled in vmalloc tests
has been removed from the -mm tree. Its filename was
kasan-check-kasan_vmalloc_enabled-in-vmalloc-tests.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: check kasan_vmalloc_enabled in vmalloc tests
Date: Thu, 21 Dec 2023 21:04:50 +0100
Check that vmalloc poisoning is not disabled via command line when running the vmalloc-related KASAN tests. Skip the tests otherwise.
---
mm/kasan/hw_tags.c | 1 + mm/kasan/kasan.h | 5 +++++ mm/kasan/kasan_test.c | 11 ++++++++++- 3 files changed, 16 insertions(+), 1 deletion(-)
mm/kasan/hw_tags.c renamed from mm/kasan/hw_tags.c~kasan-check-kasan_vmalloc_enabled-in-vmalloc-tests +1 -0
@@ -62,6 +62,7 @@ DEFINE_STATIC_KEY_TRUE(kasan_flag_vmallo#else DEFINE_STATIC_KEY_FALSE (kasan_flag_vmalloc);#endif +EXPORT_SYMBOL_GPL (kasan_flag_vmalloc);#define PAGE_ALLOC_SAMPLE_DEFAULT 1#define PAGE_ALLOC_SAMPLE_ORDER_DEFAULT 3
mm/kasan/kasan.h renamed from mm/kasan/kasan.h~kasan-check-kasan_vmalloc_enabled-in-vmalloc-tests +5 -0
@@ -83,6 +83,11 @@ static inline bool kasan_sample_page_all#else /* CONFIG_KASAN_HW_TAGS */ +static inline bool kasan_vmalloc_enabled (void ) +{ +return IS_ENABLED (CONFIG_KASAN_VMALLOC ); +} +static inline bool kasan_async_fault_possible (void ) {return false;
mm/kasan/kasan_test.c renamed from mm/kasan/kasan_test.c~kasan-check-kasan_vmalloc_enabled-in-vmalloc-tests +10 -1
@@ -1552,6 +1552,9 @@ static void vmalloc_helpers_tags(structKASAN_TEST_NEEDS_CONFIG_ON (test,CONFIG_KASAN_VMALLOC ); +if (!kasan_vmalloc_enabled ()) +kunit_skip (test,"Test requires kasan.vmalloc=on" ); + ptr =vmalloc (PAGE_SIZE );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ptr);
@@ -1586,6 +1589,9 @@ static void vmalloc_oob(struct kunit *teKASAN_TEST_NEEDS_CONFIG_ON (test,CONFIG_KASAN_VMALLOC ); +if (!kasan_vmalloc_enabled ()) +kunit_skip (test,"Test requires kasan.vmalloc=on" ); + v_ptr =vmalloc (size);KUNIT_ASSERT_NOT_ERR_OR_NULL (test, v_ptr);
@@ -1639,6 +1645,9 @@ static void vmap_tags(struct kunit *testKASAN_TEST_NEEDS_CONFIG_ON (test,CONFIG_KASAN_VMALLOC ); +if (!kasan_vmalloc_enabled ()) +kunit_skip (test,"Test requires kasan.vmalloc=on" ); + p_page =alloc_pages (GFP_KERNEL ,1 );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, p_page); p_ptr =page_address (p_page);
@@ -1757,7 +1766,7 @@ static void match_all_not_assigned(strucfree_pages ((unsigned long )ptr, order); } -if (!IS_ENABLED (CONFIG_KASAN_VMALLOC )) +if (!kasan_vmalloc_enabled ())return ;for (i =0 ; i <256 ; i++) {
_
Patches currently in -mm which might be from [email protected] are
kasan-stop-leaking-stack-trace-handles.patch