Commit 557ea253 authored Feb 20, 2019 by Andrey Konovalov Committed by Linus Torvalds Feb 21, 2019

kasan, slab: remove redundant kasan_slab_alloc hooks

kasan_slab_alloc() calls in kmem_cache_alloc() and kmem_cache_alloc_node()
are redundant as they are already called via slab_alloc/slab_alloc_node()->
slab_post_alloc_hook()->kasan_slab_alloc().  Remove them.

Link: http://lkml.kernel.org/r/4ca1655cdcfc4379c49c50f7bf80f81c4ad01485.1550602886.git.andreyknvl@google.com


Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Tested-by: Qian Cai <cai@lca.pw>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Evgeniy Stepanov <eugenis@google.com>
Cc: Kostya Serebryany <kcc@google.com>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 51dedad0

mm/slab.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -3547,7 +3547,6 @@ void kmem_cache_alloc(struct kmem_cache cachep, gfp_t flags)
		{
		void *ret = slab_alloc(cachep, flags, _RET_IP_);

		ret = kasan_slab_alloc(cachep, ret, flags);
		trace_kmem_cache_alloc(_RET_IP_, ret,
		cachep->object_size, cachep->size, flags);

		@@ -3637,7 +3636,6 @@ void kmem_cache_alloc_node(struct kmem_cache cachep, gfp_t flags, int nodeid)
		{
		void *ret = slab_alloc_node(cachep, flags, nodeid, _RET_IP_);

		ret = kasan_slab_alloc(cachep, ret, flags);
		trace_kmem_cache_alloc_node(_RET_IP_, ret,
		cachep->object_size, cachep->size,
		flags, nodeid);

Admin message