[PATCH v2 2/3] kprobes: adjust kprobe addr for KPROBES_ON_FTRACE
From: Jisheng Zhang <hidden>
Date: 2019-08-20 03:53:35
Also in:
linux-doc, lkml
Subsystem:
kprobes, the rest · Maintainers:
Naveen N Rao, "David S. Miller", Masami Hiramatsu, Linus Torvalds
For KPROBES_ON_FTRACE case, we need to adjust the kprobe's addr correspondingly. Signed-off-by: Jisheng Zhang <redacted> --- kernel/kprobes.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 9873fc627d61..3fd2f68644da 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c@@ -1484,15 +1484,19 @@ static inline int check_kprobe_rereg(struct kprobe *p) int __weak arch_check_ftrace_location(struct kprobe *p) { - unsigned long ftrace_addr; + unsigned long ftrace_addr, addr = (unsigned long)p->addr; - ftrace_addr = ftrace_location((unsigned long)p->addr); +#ifdef CONFIG_KPROBES_ON_FTRACE + addr = ftrace_call_adjust(addr); +#endif + ftrace_addr = ftrace_location(addr); if (ftrace_addr) { #ifdef CONFIG_KPROBES_ON_FTRACE /* Given address is not on the instruction boundary */ - if ((unsigned long)p->addr != ftrace_addr) + if (addr != ftrace_addr) return -EILSEQ; p->flags |= KPROBE_FLAG_FTRACE; + p->addr = (kprobe_opcode_t *)addr; #else /* !CONFIG_KPROBES_ON_FTRACE */ return -EINVAL; #endif
--
2.23.0.rc1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel