]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
kprobes: Mark ftrace mcount handler functions nokprobe
authorMasami Hiramatsu <mhiramat@kernel.org>
Sat, 23 Feb 2019 16:50:20 +0000 (01:50 +0900)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 13 Aug 2019 11:39:11 +0000 (12:39 +0100)
commit51d68a4c8e5309c4f8bdcb71d8535215246210f8
tree69fe202211f655b6a54f12633a524fa20c67a355
parent2b487afcd06e39e9af6074f5ecb2e2025b84a95d
kprobes: Mark ftrace mcount handler functions nokprobe

commit fabe38ab6b2bd9418350284c63825f13b8a6abba upstream.

Mark ftrace mcount handler functions nokprobe since
probing on these functions with kretprobe pushes
return address incorrectly on kretprobe shadow stack.

Reported-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Tested-by: Andrea Righi <righi.andrea@gmail.com>
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/155094062044.6137.6419622920568680640.stgit@devbox
Signed-off-by: Ingo Molnar <mingo@kernel.org>
[bwh: Backported to 3.16: there is no ftrace_ops_assist_func()]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
kernel/trace/ftrace.c