Commit 32868715 authored by Kees Cook's avatar Kees Cook Committed by Vlastimil Babka
Browse files

mm/slab_common: Restore passing "caller" for tracing 



The "caller" argument was accidentally being ignored in a few places
that were recently refactored. Restore these "caller" arguments, instead
of _RET_IP_.

Fixes: 11e9734b ("mm/slab_common: unify NUMA and UMA version of tracepoints")
Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: linux-mm@kvack.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarHyeonggon Yoo <42.hyeyoo@gmail.com>
Signed-off-by: default avatarVlastimil Babka <vbabka@suse.cz>
parent eb4940d4

mm/slab_common.c

+2 −2
Original line number Diff line number Diff line
@@ -941,7 +941,7 @@ void *__do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller 


	if (unlikely(size > KMALLOC_MAX_CACHE_SIZE)) {

		ret = __kmalloc_large_node(size, flags, node);

		trace_kmalloc(_RET_IP_, ret, size,

		trace_kmalloc(caller, ret, size,

			      PAGE_SIZE << get_order(size), flags, node);

		return ret;

	}
@@ -953,7 +953,7 @@ void *__do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller 


	ret = __kmem_cache_alloc_node(s, flags, node, size, caller);

	ret = kasan_kmalloc(s, ret, size, flags);

	trace_kmalloc(_RET_IP_, ret, size, s->size, flags, node);

	trace_kmalloc(caller, ret, size, s->size, flags, node);

	return ret;

}