kasan-remove-slub-checks-for-page_alloc-fallbacks-in-tests.patch removed from -mm tree
The quilt patch titled
Subject: kasan: remove SLUB checks for page_alloc fallbacks in tests
has been removed from the -mm tree. Its filename was
kasan-remove-slub-checks-for-page_alloc-fallbacks-in-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: remove SLUB checks for page_alloc fallbacks in tests
Date: Thu, 21 Dec 2023 21:04:52 +0100
A number of KASAN tests rely on the fact that calling kmalloc with a size larger than an order-1 page falls back onto page_alloc.
This fallback was originally only implemented for SLUB, but since commit d6a71648dbc0 ("mm/slab: kmalloc: pass requests larger than order-1 page to page allocator"), it is also implemented for SLAB.
Thus, drop the SLUB checks from the tests.
---
mm/kasan/kasan_test.c | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-)
mm/kasan/kasan_test.c renamed from mm/kasan/kasan_test.c~kasan-remove-slub-checks-for-page_alloc-fallbacks-in-tests +2 -24
@@ -215,7 +215,7 @@ static void kmalloc_node_oob_right(struc/* * Check that KASAN detects an out-of-bounds access for a big object allocated -* via kmalloc(). But not as big as to trigger the page_alloc fallback for SLUB. +* via kmalloc(). But not as big as to trigger the page_alloc fallback. */ static void kmalloc_big_oob_right (struct kunit *test) {
@@ -233,8 +233,7 @@ static void kmalloc_big_oob_right(struct/* * The kmalloc_large_* tests below use kmalloc() to allocate a memory chunk * that does not fit into the largest slab cache and therefore is allocated via -* the page_alloc fallback for SLUB. SLAB has no such fallback, and thus these -* tests are not supported for it. +* the page_alloc fallback. */ static void kmalloc_large_oob_right (struct kunit *test)
@@ -242,8 +241,6 @@ static void kmalloc_large_oob_right(struchar *ptr;size_t size =KMALLOC_MAX_CACHE_SIZE +10 ; -KASAN_TEST_NEEDS_CONFIG_ON (test,CONFIG_SLUB ); - ptr =kmalloc (size,GFP_KERNEL );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ptr);
@@ -258,8 +255,6 @@ static void kmalloc_large_uaf(struct kunchar *ptr;size_t size =KMALLOC_MAX_CACHE_SIZE +10 ; -KASAN_TEST_NEEDS_CONFIG_ON (test,CONFIG_SLUB ); - ptr =kmalloc (size,GFP_KERNEL );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ptr);kfree (ptr);
@@ -272,8 +267,6 @@ static void kmalloc_large_invalid_free(schar *ptr;size_t size =KMALLOC_MAX_CACHE_SIZE +10 ; -KASAN_TEST_NEEDS_CONFIG_ON (test,CONFIG_SLUB ); - ptr =kmalloc (size,GFP_KERNEL );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ptr);
@@ -407,18 +400,12 @@ static void krealloc_less_oob(struct kunstatic void krealloc_large_more_oob (struct kunit *test) { -/* page_alloc fallback is only implemented for SLUB. */ -KASAN_TEST_NEEDS_CONFIG_ON (test,CONFIG_SLUB ); -krealloc_more_oob_helper (test,KMALLOC_MAX_CACHE_SIZE +201 ,KMALLOC_MAX_CACHE_SIZE +235 ); }static void krealloc_large_less_oob (struct kunit *test) { -/* page_alloc fallback is only implemented for SLUB. */ -KASAN_TEST_NEEDS_CONFIG_ON (test,CONFIG_SLUB ); -krealloc_less_oob_helper (test,KMALLOC_MAX_CACHE_SIZE +235 ,KMALLOC_MAX_CACHE_SIZE +201 ); }
@@ -1156,9 +1143,6 @@ static void mempool_kmalloc_large_uaf(stsize_t size =KMALLOC_MAX_CACHE_SIZE +1 ;void *extra_elem; -/* page_alloc fallback is only implemented for SLUB. */ -KASAN_TEST_NEEDS_CONFIG_ON (test,CONFIG_SLUB ); - extra_elem =mempool_prepare_kmalloc (test, &pool, size);mempool_uaf_helper (test, &pool, false);
@@ -1227,9 +1211,6 @@ static void mempool_kmalloc_large_doublesize_t size =KMALLOC_MAX_CACHE_SIZE +1 ;char *extra_elem; -/* page_alloc fallback is only implemented for SLUB. */ -KASAN_TEST_NEEDS_CONFIG_ON (test,CONFIG_SLUB ); - extra_elem =mempool_prepare_kmalloc (test, &pool, size);mempool_double_free_helper (test, &pool);
@@ -1284,9 +1265,6 @@ static void mempool_kmalloc_large_invalisize_t size =KMALLOC_MAX_CACHE_SIZE +1 ;char *extra_elem; -/* page_alloc fallback is only implemented for SLUB. */ -KASAN_TEST_NEEDS_CONFIG_ON (test,CONFIG_SLUB ); - extra_elem =mempool_prepare_kmalloc (test, &pool, size);mempool_kmalloc_invalid_free_helper (test, &pool);
_
Patches currently in -mm which might be from [email protected] are
kasan-stop-leaking-stack-trace-handles.patch