KFENCE: cleanup kfence_guarded_alloc() after CONFIG_SLAB removal

Some struct slab fields are initialized differently for SLAB and SLUB so
we can simplify with SLUB being the only remaining allocator.

Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Marco Elver <elver@google.com>
Acked-by: David Rientjes <rientjes@google.com>
Tested-by: David Rientjes <rientjes@google.com>
Reviewed-by: Hyeonggon Yoo <42.hyeyoo@gmail.com>
Tested-by: Hyeonggon Yoo <42.hyeyoo@gmail.com>
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>

diff --git a/mm/kfence/core.c b/mm/kfence/core.c
index 3872528d096380b0c412897e7cc7b56b4cb59eb9..8350f5c06f2e0a9c87dfd32182a970f922d2b21a 100644 (file)
--- a/mm/kfence/core.c
+++ b/mm/kfence/core.c
@@ -463,11 +463,7 @@ static void *kfence_guarded_alloc(struct kmem_cache *cache, size_t size, gfp_t g
        /* Set required slab fields. */
        slab = virt_to_slab((void *)meta->addr);
        slab->slab_cache = cache;
-#if defined(CONFIG_SLUB)
        slab->objects = 1;
-#elif defined(CONFIG_SLAB)
-       slab->s_mem = addr;
-#endif
 
        /* Memory initialization. */
        set_canary(meta);