kasan-clean-up-__kasan_mempool_poison_object.patch removed from -mm tree
The quilt patch titled
Subject: kasan: clean up __kasan_mempool_poison_object
has been removed from the -mm tree. Its filename was
kasan-clean-up-__kasan_mempool_poison_object.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: clean up __kasan_mempool_poison_object
Date: Tue, 19 Dec 2023 23:28:52 +0100
Reorganize the code and reword the comment in __kasan_mempool_poison_object to improve the code readability.
Link https://lkml.kernel.org/r/4f6fc8840512286c1a96e16e86901082c671677d.1703024586.git.andreyknvl@google.com open here
Signed-off-by Andrey Konovalov <[email protected]>
Cc Alexander Lobakin <[email protected]>
Cc Alexander Potapenko <[email protected]>
Cc Andrey Ryabinin <[email protected]>
Cc Breno Leitao <[email protected]>
Cc Dmitry Vyukov <[email protected]>
Cc Evgenii Stepanov <[email protected]>
Cc Marco Elver <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/kasan/common.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
mm/kasan/common.c renamed from mm/kasan/common.c~kasan-clean-up-__kasan_mempool_poison_object +7 -12
@@ -457,27 +457,22 @@ void __kasan_mempool_unpoison_pages(strubool __kasan_mempool_poison_object (void *ptr,unsigned long ip) { -struct folio *folio; - - folio =virt_to_folio (ptr); +struct folio *folio =virt_to_folio (ptr); +struct slab *slab;/* -* Even though this function is only called for kmem_cache_alloc and -* kmalloc backed mempool allocations, those allocations can still be -* !PageSlab() when the size provided to kmalloc is larger than -* KMALLOC_MAX_SIZE, and kmalloc falls back onto page_alloc. +* This function can be called for large kmalloc allocation that get +* their memory from page_alloc. Thus, the folio might not be a slab. */ if (unlikely (!folio_test_slab (folio))) {if (check_page_allocation (ptr, ip))return false;kasan_poison (ptr,folio_size (folio),KASAN_PAGE_FREE , false);return true; - }else { -struct slab *slab =folio_slab (folio); - -return !____kasan_slab_free (slab->slab_cache, ptr, ip, - false, false); } + + slab =folio_slab (folio); +return !____kasan_slab_free (slab->slab_cache, ptr, ip, false, false); }void __kasan_mempool_unpoison_object (void *ptr,size_t size,unsigned long ip)
_
Patches currently in -mm which might be from [email protected] are
kasan-stop-leaking-stack-trace-handles.patch