Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7376aed authored by Andrey Ryabinin's avatar Andrey Ryabinin Committed by Linus Torvalds
Browse files

mm/kasan, slub: don't disable interrupts when object leaves quarantine 

SLUB doesn't require disabled interrupts to call ___cache_free().

Link: http://lkml.kernel.org/r/1470062715-14077-3-git-send-email-aryabinin@virtuozzo.com


Signed-off-by: default avatarAndrey Ryabinin <aryabinin@virtuozzo.com>
Acked-by: default avatarAlexander Potapenko <glider@google.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4b3ec5a3

mm/kasan/quarantine.c

+6 −2
Original line number Diff line number Diff line
@@ -147,9 +147,13 @@ static void qlink_free(struct qlist_node *qlink, struct kmem_cache *cache) 
	struct kasan_alloc_meta *alloc_info = get_alloc_info(cache, object);

	unsigned long flags;



	if (IS_ENABLED(CONFIG_SLAB))

		local_irq_save(flags);



	alloc_info->state = KASAN_STATE_FREE;

	___cache_free(cache, object, _THIS_IP_);



	if (IS_ENABLED(CONFIG_SLAB))

		local_irq_restore(flags);

}