kasan-move-kasan_mempool_poison_object.patch removed from -mm tree
The quilt patch titled
Subject: kasan: move kasan_mempool_poison_object
has been removed from the -mm tree. Its filename was
kasan-move-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: move kasan_mempool_poison_object
Date: Tue, 19 Dec 2023 23:28:46 +0100
Move kasan_mempool_poison_object after all slab-related KASAN hooks.
This is a preparatory change for the following patches in this series.
No functional changes.
---
include/linux/kasan.h | 16 ++++++------- mm/kasan/common.c | 46 ++++++++++++++++++++-------------------- 2 files changed, 31 insertions(+), 31 deletions(-)
include/linux/kasan.h renamed from include/linux/kasan.h~kasan-move-kasan_mempool_poison_object +8 -8
@@ -172,13 +172,6 @@ static __always_inline void kasan_kfree___kasan_kfree_large (ptr, _RET_IP_); } -void __kasan_mempool_poison_object (void *ptr,unsigned long ip); -static __always_inline void kasan_mempool_poison_object(void *ptr) -{ -if (kasan_enabled ()) -__kasan_mempool_poison_object (ptr, _RET_IP_); -} -void *__must_check __kasan_slab_alloc (struct kmem_cache *s,void *object,gfp_t flags,bool init); static __always_inline void * __must_check kasan_slab_alloc(
@@ -219,6 +212,13 @@ static __always_inline void * __must_chereturn (void *)object; } +void __kasan_mempool_poison_object (void *ptr,unsigned long ip); +static __always_inline void kasan_mempool_poison_object(void *ptr) +{ +if (kasan_enabled ()) +__kasan_mempool_poison_object (ptr, _RET_IP_); +} +/* * Unlike kasan_check_read/write(), kasan_check_byte() is performed even for * the hardware tag-based mode that doesn't rely on compiler instrumentation.
@@ -256,7 +256,6 @@ static inline bool kasan_slab_free(strucreturn false; }static inline void kasan_kfree_large (void *ptr) {} -static inline void kasan_mempool_poison_object (void *ptr) {}static inline void *kasan_slab_alloc (struct kmem_cache *s,void *object,gfp_t flags,bool init) {
@@ -276,6 +275,7 @@ static inline void *kasan_krealloc(const {return (void *)object; } +static inline void kasan_mempool_poison_object (void *ptr) {}static inline bool kasan_check_byte (const void *address) {return true;
mm/kasan/common.c renamed from mm/kasan/common.c~kasan-move-kasan_mempool_poison_object +23 -23
58 lines not on this page · raw message
_
Patches currently in -mm which might be from [email protected] are
kasan-stop-leaking-stack-trace-handles.patch