aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMarcin Nowakowski <marcin.nowakowski@imgtec.com>2016-09-22 15:38:31 +0200
committerRalf Baechle <ralf@linux-mips.org>2016-09-29 18:59:49 +0200
commitdb06068a4fd44a57b642b369d2a295b8448f6b65 (patch)
tree92098a88b6b2874843f0638622ad27a8380d9ff0 /arch
parent6ca8ac773e97e2dfa5734ae435c40e672dd19ac4 (diff)
downloadlinux-stericsson-db06068a4fd44a57b642b369d2a295b8448f6b65.tar.gz
MIPS: fix uretprobe implementation
arch_uretprobe_hijack_return_addr should replace the return address for a call with a trampoline address. Signed-off-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com> Fixes: 40e084a506eb ('MIPS: Add uprobes support.') Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/14298/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/kernel/uprobes.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/uprobes.c b/arch/mips/kernel/uprobes.c
index 1149b30c9aeb..cd8a68948066 100644
--- a/arch/mips/kernel/uprobes.c
+++ b/arch/mips/kernel/uprobes.c
@@ -257,7 +257,7 @@ unsigned long arch_uretprobe_hijack_return_addr(
ra = regs->regs[31];
/* Replace the return address with the trampoline address */
- regs->regs[31] = ra;
+ regs->regs[31] = trampoline_vaddr;
return ra;
}