kasan, slab: remove redundant kasan_slab_alloc hooks

xairy · torvalds · commit 557ea25383a2 · 2019-02-21T09:01:00.000-08:00
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>
diff --git a/mm/slab.c b/mm/slab.c
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -3547,7 +3547,6 @@ void kmem_cache_alloc(struct kmem_cache cachep, gfp_t flags)`
`3547`	`3547`	`{`
`3548`	`3548`	`void *ret = slab_alloc(cachep, flags, _RET_IP_);`
`3549`	`3549`
`3550`		`- ret = kasan_slab_alloc(cachep, ret, flags);`
`3551`	`3550`	`trace_kmem_cache_alloc(_RET_IP_, ret,`
`3552`	`3551`	`cachep->object_size, cachep->size, flags);`
`3553`	`3552`
`@@ -3637,7 +3636,6 @@ void kmem_cache_alloc_node(struct kmem_cache cachep, gfp_t flags, int nodeid)`
`3637`	`3636`	`{`
`3638`	`3637`	`void *ret = slab_alloc_node(cachep, flags, nodeid, _RET_IP_);`
`3639`	`3638`
`3640`		`- ret = kasan_slab_alloc(cachep, ret, flags);`
`3641`	`3639`	`trace_kmem_cache_alloc_node(_RET_IP_, ret,`
`3642`	`3640`	`cachep->object_size, cachep->size,`
`3643`	`3641`	`flags, nodeid);`