From 6a3111af2501fb2b332d5a5441eb9a06c099ba74 Mon Sep 17 00:00:00 2001 From: Anders Roxell Date: Mon, 10 Dec 2018 11:11:31 +0100 Subject: [PATCH] kasan: mark kasan_check_(read|write) as 'notrace' When option CONFIG_KASAN is enabled toghether with ftrace, function ftrace_graph_caller() gets in to a recursion, via functions kasan_check_read() and kasan_check_write(). Rework so that kasan_check_read() and kasan_check_write() is marked with 'notrace'. Signed-off-by: Anders Roxell --- mm/kasan/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 03d5d1374ca7..71507d15712b 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -95,13 +95,13 @@ void kasan_disable_current(void) current->kasan_depth--; } -void kasan_check_read(const volatile void *p, unsigned int size) +void notrace kasan_check_read(const volatile void *p, unsigned int size) { check_memory_region((unsigned long)p, size, false, _RET_IP_); } EXPORT_SYMBOL(kasan_check_read); -void kasan_check_write(const volatile void *p, unsigned int size) +void notrace kasan_check_write(const volatile void *p, unsigned int size) { check_memory_region((unsigned long)p, size, true, _RET_IP_); } -- 2.19.2