kfence, slab: fix cache_alloc_debugcheck_after() for bulk allocations
PATCH 1/1 kfence, slab: fix cache_alloc_debugcheck_after() for bulk allocations
cache_alloc_debugcheck_after() performs checks on an object, including adjusting the returned pointer. None of this should apply to KFENCE objects. While for non-bulk allocations, the checks are skipped when we allocate via KFENCE, for bulk allocations cache_alloc_debugcheck_after() is called via cache_alloc_debugcheck_after_bulk().
Fix it by skipping cache_alloc_debugcheck_after() for KFENCE objects.
--- mm/slab.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/slab.c +1 -1
@@ -2992,7 +2992,7 @@ static void *cache_alloc_debugcheck_after(struct kmem_cache *cachep, gfp_t flags, void *objp, unsigned long caller) { WARN_ON_ONCE(cachep->ctor && (flags & __GFP_ZERO)); -if (!objp) +if (!objp ||is_kfence_address (objp))return objp;if (cachep->flags &SLAB_POISON ) {check_poison_obj (cachep, objp);
Signature · 1 line
2.30.1.766.gb4fecdf3b7-goog
Quoted 6 lines · Marco Elver
cache_alloc_debugcheck_after()performs checks on an object, including adjusting the returned pointer. None of this should apply to KFENCE objects. While for non-bulk allocations, the checks are skipped when we allocate via KFENCE, for bulk allocationscache_alloc_debugcheck_after()is called viacache_alloc_debugcheck_after_bulk().
@Andrew, is this code used by anyone?
As far as I understand, it cannot be enabled by any config option, so nobody really tests it.
If it is still needed, shall we promote #if DEBUGs in slab.c to a separate config option, or maybe this code can be safely removed?
Alex
Andrew Morton
maintainerQuoted 8 lines · On Thu, 4 Mar 2021 22:05:48 +0100 Alexander Potapenko <[email protected]> wrote:
Quoted 6 lines · Marco Elver
cache_alloc_debugcheck_after()performs checks on an object, including adjusting the returned pointer. None of this should apply to KFENCE objects. While for non-bulk allocations, the checks are skipped when we allocate via KFENCE, for bulk allocationscache_alloc_debugcheck_after()is called viacache_alloc_debugcheck_after_bulk().
Quoted 5 lines
@Andrew, is this code used by anyone?
As far as I understand, it cannot be enabled by any config option, so nobody really tests it.
If it is still needed, shall we promote #if DEBUGs inslab.cto a separate config option, or maybe this code can be safely removed?
It's all used:
#ifdef CONFIG_DEBUG_SLAB
#define DEBUG 1
#define STATS 1
#define FORCED_DEBUG 1
#else
#define DEBUG 0
#define STATS 0
#define FORCED_DEBUG 0
#endif
Quoted 11 lines · Andrew Morton
Quoted 8 lines · On Thu, 4 Mar 2021 22:05:48 +0100 Alexander Potapenko <[email protected]> wrote:
Quoted 6 lines · Marco Elver
cache_alloc_debugcheck_after()performs checks on an object, including adjusting the returned pointer. None of this should apply to KFENCE objects. While for non-bulk allocations, the checks are skipped when we allocate via KFENCE, for bulk allocationscache_alloc_debugcheck_after()is called viacache_alloc_debugcheck_after_bulk().
Quoted 7 lines
Quoted 5 lines
@Andrew, is this code used by anyone?
As far as I understand, it cannot be enabled by any config option, so nobody really tests it.
If it is still needed, shall we promote #if DEBUGs inslab.cto a separate config option, or maybe this code can be safely removed?It's all used:
Got it, sorry for being too hasty!