summaryrefslogtreecommitdiff
path: root/mm/kfence
diff options
context:
space:
mode:
authorVlastimil Babka <vbabka@suse.cz>2023-10-02 16:28:44 +0200
committerVlastimil Babka <vbabka@suse.cz>2023-12-05 11:17:58 +0100
commita745b067db0f0711974063deb78c6639c24ec5bf (patch)
tree5531c99ada5b9efb12f8157765bfa4fb221633f7 /mm/kfence
parent72786c0a3dc5d4151469f512909049a0b17ada3d (diff)
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>
Diffstat (limited to 'mm/kfence')
-rw-r--r--mm/kfence/core.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/mm/kfence/core.c b/mm/kfence/core.c
index 3872528d0963..8350f5c06f2e 100644
--- 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);