path: root/mm/kasan
diff options
authorAndrey Konovalov <>2021-02-25 17:20:07 -0800
committerLinus Torvalds <>2021-02-26 09:41:03 -0800
commitdf54b383124cf3e09f66644ee8a2eb977e8c7f26 (patch)
tree4787c3f94a55d64f21ee6a38f25948a55bfec7fc /mm/kasan
parent43a219cbe5a46ec3f6a1874bb2cb2fd4de8322cc (diff)
kasan: clean up setting free info in kasan_slab_free
Put kasan_stack_collection_enabled() check and kasan_set_free_info() calls next to each other. The way this was previously implemented was a minor optimization that relied of the the fact that kasan_stack_collection_enabled() is always true for generic KASAN. The confusion that this brings outweights saving a few instructions. Link: Signed-off-by: Andrey Konovalov <> Reviewed-by: Marco Elver <> Cc: Alexander Potapenko <> Cc: Andrey Ryabinin <> Cc: Branislav Rankov <> Cc: Catalin Marinas <> Cc: Dmitry Vyukov <> Cc: Evgenii Stepanov <> Cc: Kevin Brodsky <> Cc: Peter Collingbourne <> Cc: Vincenzo Frascino <> Cc: Will Deacon <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'mm/kasan')
1 files changed, 2 insertions, 4 deletions
diff --git a/mm/kasan/common.c b/mm/kasan/common.c
index dcdc92948364..48d51daeda95 100644
--- a/mm/kasan/common.c
+++ b/mm/kasan/common.c
@@ -350,13 +350,11 @@ static bool ____kasan_slab_free(struct kmem_cache *cache, void *object,
kasan_poison(object, cache->object_size, KASAN_KMALLOC_FREE);
- if (!kasan_stack_collection_enabled())
- return false;
if ((IS_ENABLED(CONFIG_KASAN_GENERIC) && !quarantine))
return false;
- kasan_set_free_info(cache, object, tag);
+ if (kasan_stack_collection_enabled())
+ kasan_set_free_info(cache, object, tag);
return kasan_quarantine_put(cache, object);