mempool-use-new-mempool-kasan-hooks.patch removed from -mm tree
The quilt patch titled
Subject: mempool: use new mempool KASAN hooks
has been removed from the -mm tree. Its filename was
mempool-use-new-mempool-kasan-hooks.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: mempool: use new mempool KASAN hooks
Date: Tue, 19 Dec 2023 23:28:58 +0100
Update the mempool code to use the new mempool KASAN hooks.
Rely on the return value of kasan_mempool_poison_object and kasan_mempool_poison_pages to prevent double-free and invalid-free bugs.
---
mm/mempool.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
mm/mempool.c renamed from mm/mempool.c~mempool-use-new-mempool-kasan-hooks +12 -10
@@ -112,32 +112,34 @@ static inline void poison_element(mempoo }#endif /* CONFIG_DEBUG_SLAB || CONFIG_SLUB_DEBUG_ON */ -static __always_inline void kasan_poison_element(mempool_t *pool, void *element) +static __always_inline bool kasan_poison_element(mempool_t *pool, void *element) {if (pool->alloc == mempool_alloc_slab || pool->alloc == mempool_kmalloc) -kasan_mempool_poison_object (element); +return kasan_mempool_poison_object (element);else if (pool->alloc == mempool_alloc_pages) -kasan_poison_pages (element, (unsigned long )pool->pool_data, - false); +return kasan_mempool_poison_pages (element, + (unsigned long )pool->pool_data); +return true; }static void kasan_unpoison_element (mempool_t *pool,void *element) {if (pool->alloc == mempool_kmalloc) -kasan_unpoison_range (element, (size_t )pool->pool_data); +kasan_mempool_unpoison_object (element, (size_t )pool->pool_data);else if (pool->alloc == mempool_alloc_slab) -kasan_unpoison_range (element,kmem_cache_size (pool->pool_data)); +kasan_mempool_unpoison_object (element, +kmem_cache_size (pool->pool_data));else if (pool->alloc == mempool_alloc_pages) -kasan_unpoison_pages (element, (unsigned long )pool->pool_data, - false); +kasan_mempool_unpoison_pages (element, + (unsigned long )pool->pool_data); } static __always_inline void add_element(mempool_t *pool, void *element) {BUG_ON (pool->curr_nr >= pool->min_nr);poison_element (pool, element); -kasan_poison_element (pool, element); - pool->elements[pool->curr_nr++] = element; +if (kasan_poison_element (pool, element)) + pool->elements[pool->curr_nr++] = element; }static void *remove_element (mempool_t *pool)
_
Patches currently in -mm which might be from [email protected] are
kasan-stop-leaking-stack-trace-handles.patch