kasan-stop-leaking-stack-trace-handles.patch removed from -mm tree
The quilt patch titled
Subject: kasan: stop leaking stack trace handles
has been removed from the -mm tree. Its filename was
kasan-stop-leaking-stack-trace-handles.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: stop leaking stack trace handles
Date: Tue, 26 Dec 2023 23:51:21 +0100
Commit 773688a6cb24 ("kasan: use stack_depot_put for Generic mode") added support for stack trace eviction for Generic KASAN.
However, that commit didn't evict stack traces when the object is not put into quarantine. As a result, some stack traces are never evicted from the stack depot.
In addition, with the "kasan: save mempool stack traces" series, the free stack traces for mempool objects are also not properly evicted from the stack depot.
Fix both issues by:
1. Evicting all stack traces when an object if freed if it was not put into quarantine;
2. Always evicting an existing free stack trace when a new one is saved.
Also do a few related clean-ups:
- Do not zero out free track when initializing/invalidating free meta:
set a value in shadow memory instead;
- Rename KASAN_SLAB_FREETRACK to KASAN_SLAB_FREE_META;
- Drop the kasan_init_cache_meta function as it's not used by KASAN;
- Add comments for the kasan_alloc_meta and kasan_free_meta structs.
---
mm/kasan/common.c | 27 +++++++++++++--- mm/kasan/generic.c | 60 ++++++++++++++++++++++++++++++------ mm/kasan/kasan.h | 25 +++++++++++---- mm/kasan/quarantine.c | 20 ------------ mm/kasan/report_generic.c | 6 +-- 5 files changed, 97 insertions(+), 41 deletions(-)
mm/kasan/common.c renamed from mm/kasan/common.c~kasan-stop-leaking-stack-trace-handles +23 -4
@@ -255,14 +255,33 @@ static inline bool poison_slab_object(stbool __kasan_slab_free (struct kmem_cache *cache,void *object,unsigned long ip,bool init) { -bool buggy_object; -if (is_kfence_address (object))return false; - buggy_object =poison_slab_object (cache, object, ip, init); +/* +* If the object is buggy, do not let slab put the object onto the +* freelist. The object will thus never be allocated again and its +* metadata will never get released. +*/ +if (poison_slab_object (cache, object, ip, init)) +return true; + +/* +* If the object is put into quarantine, do not let slab put the object +* onto the freelist for now. The object's metadata is kept until the +* object gets evicted from quarantine. +*/ +if (kasan_quarantine_put (cache, object)) +return true; + +/* +* If the object is not put into quarantine, it will likely be quickly +* reallocated. Thus, release its metadata now. +*/ +kasan_release_object_meta (cache, object); -return buggy_object ? true :kasan_quarantine_put (cache, object); +/* Let slab put the object onto the freelist. */ +return false; }static inline bool check_page_allocation (void *ptr,unsigned long ip)
mm/kasan/generic.c renamed from mm/kasan/generic.c~kasan-stop-leaking-stack-trace-handles +51 -9
88 lines not on this page · raw message
mm/kasan/kasan.h renamed from mm/kasan/kasan.h~kasan-stop-leaking-stack-trace-handles +19 -6
@@ -156,7 +156,7 @@ static inline bool kasan_requires_meta(v#ifdef CONFIG_KASAN_GENERIC -#define KASAN_SLAB_FREETRACK 0xFA/* freed slab object with free track */ +#define KASAN_SLAB_FREE_META 0xFA/* freed slab object with free meta */ #define KASAN_GLOBAL_REDZONE 0xF9/* redzone for global variable */ /* Stack redzone shadow values. Compiler ABI, do not change. */
@@ -253,6 +253,15 @@ struct kasan_global { #ifdef CONFIG_KASAN_GENERIC +/* + * Alloc meta contains the allocation-related information about a slab object. + * Alloc meta is saved when an object is allocated and is kept until either the + * object returns to the slab freelist (leaves quarantine for quarantined + * objects or gets freed for the non-quarantined ones) or reallocated via + * krealloc or through a mempool. + * Alloc meta is stored inside of the object's redzone. + * Alloc meta is considered valid whenever it contains non-zero data. + */ struct kasan_alloc_meta { struct kasan_track alloc_track; /* Free track is stored in kasan_free_meta. */
@@ -278,8 +287,12 @@ struct qlist_node {#define KASAN_NO_FREE_META INT_MAX/* -* Free meta is only used by Generic mode while the object is in quarantine. -* After that, slab allocator stores the freelist pointer in the object. +* Free meta contains the freeing-related information about a slab object. +* Free meta is only kept for quarantined objects and for mempool objects until +* the object gets allocated again. +* Free meta is stored within the object's memory. +* Free meta is considered valid whenever the value of the shadow byte that +* corresponds to the first 8 bytes of the object is KASAN_SLAB_FREE_META. */ struct kasan_free_meta {struct qlist_node quarantine_link;
@@ -380,15 +393,15 @@ void kasan_report_invalid_free(void *objstruct slab *kasan_addr_to_slab (const void *addr);#ifdef CONFIG_KASAN_GENERIC -void kasan_init_cache_meta (struct kmem_cache *cache,unsigned int *size); -void kasan_init_object_meta (struct kmem_cache *cache,const void *object);struct kasan_alloc_meta *kasan_get_alloc_meta (struct kmem_cache *cache,const void *object);struct kasan_free_meta *kasan_get_free_meta (struct kmem_cache *cache,const void *object); +void kasan_init_object_meta (struct kmem_cache *cache,const void *object); +void kasan_release_object_meta (struct kmem_cache *cache,const void *object);#else -static inline void kasan_init_cache_meta (struct kmem_cache *cache,unsigned int *size) { }static inline void kasan_init_object_meta (struct kmem_cache *cache,const void *object) { } +static inline void kasan_release_object_meta (struct kmem_cache *cache,const void *object) { }#endif depot_stack_handle_t kasan_save_stack (gfp_t flags,depot_flags_t depot_flags);
mm/kasan/quarantine.c renamed from mm/kasan/quarantine.c~kasan-stop-leaking-stack-trace-handles +1 -19
@@ -143,22 +143,10 @@ static void *qlink_to_object(struct qlisstatic void qlink_free (struct qlist_node *qlink,struct kmem_cache *cache) {void *object =qlink_to_object (qlink, cache); -struct kasan_alloc_meta *alloc_meta =kasan_get_alloc_meta (cache, object);struct kasan_free_meta *free_meta =kasan_get_free_meta (cache, object);unsigned long flags; -if (alloc_meta) { -stack_depot_put (alloc_meta->alloc_track.stack); -stack_depot_put (alloc_meta->aux_stack[0 ]); -stack_depot_put (alloc_meta->aux_stack[1 ]); -__memset (alloc_meta,0 ,sizeof (*alloc_meta)); - } - -if (free_meta && - *(u8 *)kasan_mem_to_shadow (object) ==KASAN_SLAB_FREETRACK ) { -stack_depot_put (free_meta->free_track.stack); -__memset (&free_meta->free_track,0 ,sizeof (free_meta->free_track)); - } +kasan_release_object_meta (cache, object);/* * If init_on_free is enabled and KASAN's free metadata is stored in
@@ -170,12 +158,6 @@ static void qlink_free(struct qlist_node cache->kasan_info.free_meta_offset == 0)memzero_explicit (free_meta,sizeof (*free_meta)); -/* -* As the object now gets freed from the quarantine, -* take note that its free track is no longer exists. -*/ - *(u8 *)kasan_mem_to_shadow (object) =KASAN_SLAB_FREE ; -if (IS_ENABLED (CONFIG_SLAB ))local_irq_save (flags);
mm/kasan/report_generic.c renamed from mm/kasan/report_generic.c~kasan-stop-leaking-stack-trace-handles +3 -3
@@ -110,7 +110,7 @@ static const char *get_shadow_bug_type(s bug_type ="use-after-free" ;break ;case KASAN_SLAB_FREE : -case KASAN_SLAB_FREETRACK : +case KASAN_SLAB_FREE_META : bug_type ="slab-use-after-free" ;break ;case KASAN_ALLOCA_LEFT :
@@ -173,8 +173,8 @@ void kasan_complete_mode_report_info(strmemcpy (&info->alloc_track, &alloc_meta->alloc_track,sizeof (info->alloc_track)); -if (*(u8 *)kasan_mem_to_shadow (info->object) ==KASAN_SLAB_FREETRACK ) { -/* Free meta must be present with KASAN_SLAB_FREETRACK. */ +if (*(u8 *)kasan_mem_to_shadow (info->object) ==KASAN_SLAB_FREE_META ) { +/* Free meta must be present with KASAN_SLAB_FREE_META. */ free_meta =kasan_get_free_meta (info->cache, info->object);memcpy (&info->free_track, &free_meta->free_track,sizeof (info->free_track));
_
Patches currently in -mm which might be from [email protected] are