diff options
author | 2021-09-14 23:40:45 +0900 | |
---|---|---|
committer | 2021-09-30 21:24:06 -0400 | |
commit | 96fed8ac2bb64ab45497fdd8e3d390165b7a9be8 (patch) | |
tree | 41528c6cc273ae7e6a2e59301dc5e840cf484df9 /arch/s390 | |
parent | kprobes: treewide: Replace arch_deref_entry_point() with dereference_symbol_d... (diff) | |
download | linux-96fed8ac2bb64ab45497fdd8e3d390165b7a9be8.tar.gz linux-96fed8ac2bb64ab45497fdd8e3d390165b7a9be8.tar.bz2 linux-96fed8ac2bb64ab45497fdd8e3d390165b7a9be8.zip |
kprobes: treewide: Remove trampoline_address from kretprobe_trampoline_handler()
The __kretprobe_trampoline_handler() callback, called from low level
arch kprobes methods, has the 'trampoline_address' parameter, which is
entirely superfluous as it basically just replicates:
dereference_kernel_function_descriptor(kretprobe_trampoline)
In fact we had bugs in arch code where it wasn't replicated correctly.
So remove this superfluous parameter and use kretprobe_trampoline_addr()
instead.
Link: https://lkml.kernel.org/r/163163044546.489837.13505751885476015002.stgit@devnote2
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Tested-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/kernel/kprobes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c index 952d44b0610b..5fa86e54f129 100644 --- a/arch/s390/kernel/kprobes.c +++ b/arch/s390/kernel/kprobes.c @@ -343,7 +343,7 @@ static void __used kretprobe_trampoline_holder(void) */ static int trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs) { - regs->psw.addr = __kretprobe_trampoline_handler(regs, &kretprobe_trampoline, NULL); + regs->psw.addr = __kretprobe_trampoline_handler(regs, NULL); /* * By returning a non-zero value, we are telling * kprobe_handler() that we don't want the post_handler |