kasan-introduce-kasan_mempool_poison_pages.patch removed from -mm tree
The quilt patch titled
Subject: kasan: introduce kasan_mempool_poison_pages
has been removed from the -mm tree. Its filename was
kasan-introduce-kasan_mempool_poison_pages.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: introduce kasan_mempool_poison_pages
Date: Tue, 19 Dec 2023 23:28:50 +0100
Introduce and document a kasan_mempool_poison_pages hook to be used by the mempool code instead of kasan_poison_pages.
Compated to kasan_poison_pages, the new hook:
1. For the tag-based modes, skips checking and poisoning allocations that were not tagged due to sampling.
2. Checks for double-free and invalid-free bugs.
In the future, kasan_poison_pages can also be updated to handle #2, but this is out-of-scope of this series.
---
include/linux/kasan.h | 27 +++++++++++++++++++++++++++ mm/kasan/common.c | 23 +++++++++++++++++++++++ 2 files changed, 50 insertions(+)
include/linux/kasan.h renamed from include/linux/kasan.h~kasan-introduce-kasan_mempool_poison_pages +27 -0
@@ -212,6 +212,29 @@ static __always_inline void * __must_chereturn (void *)object; } +bool __kasan_mempool_poison_pages (struct page *page,unsigned int order, +unsigned long ip); +/** +* kasan_mempool_poison_pages - Check and poison a mempool page allocation. +* @page: Pointer to the page allocation. +* @order: Order of the allocation. +* +* This function is intended for kernel subsystems that cache page allocations +* to reuse them instead of freeing them back to page_alloc (e.g. mempool). +* +* This function is similar to kasan_mempool_poison_object() but operates on +* page allocations. +* +* Return: true if the allocation can be safely reused; false otherwise. +*/ +static __always_inline bool kasan_mempool_poison_pages(struct page *page, +unsigned int order) +{ +if (kasan_enabled ()) +return __kasan_mempool_poison_pages (page, order, _RET_IP_); +return true; +} +bool __kasan_mempool_poison_object (void *ptr,unsigned long ip);/** * kasan_mempool_poison_object - Check and poison a mempool slab allocation.
@@ -326,6 +349,10 @@ static inline void *kasan_krealloc(const {return (void *)object; } +static inline bool kasan_mempool_poison_pages (struct page *page,unsigned int order) +{ +return true; +}static inline bool kasan_mempool_poison_object (void *ptr) {return true;
mm/kasan/common.c renamed from mm/kasan/common.c~kasan-introduce-kasan_mempool_poison_pages +23 -0
@@ -426,6 +426,29 @@ void * __must_check __kasan_krealloc(conreturn ____kasan_kmalloc (slab->slab_cache, object, size, flags); } +bool __kasan_mempool_poison_pages (struct page *page,unsigned int order, +unsigned long ip) +{ +unsigned long *ptr; + +if (unlikely (PageHighMem (page))) +return true; + +/* Bail out if allocation was excluded due to sampling. */ +if (!IS_ENABLED (CONFIG_KASAN_GENERIC ) && +page_kasan_tag (page) ==KASAN_TAG_KERNEL ) +return true; + + ptr =page_address (page); + +if (check_page_allocation (ptr, ip)) +return false; + +kasan_poison (ptr,PAGE_SIZE << order,KASAN_PAGE_FREE , false); + +return true; +} +bool __kasan_mempool_poison_object (void *ptr,unsigned long ip) {struct folio *folio;
_
Patches currently in -mm which might be from [email protected] are
kasan-stop-leaking-stack-trace-handles.patch