mm-slab-perform-init_on_free-earlier.patch removed from -mm tree
The patch titled
Subject: mm/slab: rerform init_on_free earlier
has been removed from the -mm tree. Its filename was
mm-slab-perform-init_on_free-earlier.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Alexander Popov <[email protected]>
Subject: mm/slab: rerform init_on_free earlier
Currently in CONFIG_SLAB init_on_free happens too late, and heap objects go to the heap quarantine not being erased.
Lets move init_on_free clearing before calling kasan_slab_free(). In that case heap quarantine will store erased objects, similarly to CONFIG_SLUB=y behavior.
Signed-off-by Alexander Popov <[email protected]>
Reviewed-by Alexander Potapenko <[email protected]>
Acked-by David Rientjes <[email protected]>
Acked-by Joonsoo Kim <[email protected]>
Cc Christoph Lameter <[email protected]>
Cc Pekka Enberg <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/slab.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
mm/slab.c renamed from mm/slab.c~mm-slab-perform-init_on_free-earlier +3 -2
@@ -3417,6 +3417,9 @@ free_done: static __always_inline void __cache_free(struct kmem_cache *cachep, void *objp,unsigned long caller) { +if (unlikely (slab_want_init_on_free (cachep))) +memset (objp,0 , cachep->object_size); +/* Put the object into the quarantine, don't touch it for now. */ if (kasan_slab_free (cachep, objp, _RET_IP_))return ;
@@ -3435,8 +3438,6 @@ void ___cache_free(struct kmem_cache *castruct array_cache *ac =cpu_cache_get (cachep);check_irq_off (); -if (unlikely (slab_want_init_on_free (cachep))) -memset (objp,0 , cachep->object_size);kmemleak_free_recursive (objp, cachep->flags); objp =cache_free_debugcheck (cachep, objp, caller);memcg_slab_free_hook (cachep, &objp,1 );
_
Patches currently in -mm which might be from [email protected] are