Commit ee07b93e authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Will Deacon
Browse files

arm64: unwind: Prohibit probing on return_address() 



Prohibit probing on return_address() and subroutines which
is called from return_address(), since the it is invoked from
trace_hardirqs_off() which is also kprobe blacklisted.

Reported-by: default avatarNaresh Kamboju <naresh.kamboju@linaro.org>
Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 677379bc

arch/arm64/kernel/return_address.c

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#include <linux/export.h>

#include <linux/ftrace.h>

#include <linux/kprobes.h>



#include <asm/stack_pointer.h>

#include <asm/stacktrace.h>
@@ -29,6 +30,7 @@ static int save_return_addr(struct stackframe *frame, void *d) 
		return 0;

	}

}

NOKPROBE_SYMBOL(save_return_addr);



void *return_address(unsigned int level)

{
@@ -49,3 +51,4 @@ void *return_address(unsigned int level) 
		return NULL;

}

EXPORT_SYMBOL_GPL(return_address);

NOKPROBE_SYMBOL(return_address);

arch/arm64/kernel/stacktrace.c

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/kernel.h>

#include <linux/export.h>

#include <linux/ftrace.h>

#include <linux/kprobes.h>

#include <linux/sched.h>

#include <linux/sched/debug.h>

#include <linux/sched/task_stack.h>
@@ -111,6 +112,7 @@ int notrace unwind_frame(struct task_struct *tsk, struct stackframe *frame) 


	return 0;

}

NOKPROBE_SYMBOL(unwind_frame);



void notrace walk_stackframe(struct task_struct *tsk, struct stackframe *frame,

		     int (*fn)(struct stackframe *, void *), void *data)
@@ -125,6 +127,7 @@ void notrace walk_stackframe(struct task_struct *tsk, struct stackframe *frame, 
			break;

	}

}

NOKPROBE_SYMBOL(walk_stackframe);



#ifdef CONFIG_STACKTRACE

struct stack_trace_data {

CRA Git | Maintained and supported by SUSTech CRA and CCSE