MIPS: fix uretprobe implementation
authorMarcin Nowakowski <marcin.nowakowski@imgtec.com>
Thu, 22 Sep 2016 13:38:31 +0000 (15:38 +0200)
committerRalf Baechle <ralf@linux-mips.org>
Thu, 29 Sep 2016 16:59:49 +0000 (18:59 +0200)
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>
arch/mips/kernel/uprobes.c

index 1149b30c9aebf7a00a0723f46a823bbe8c602425..cd8a68948066f8804cfb3ab00cd59456a28d504f 100644 (file)
@@ -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;
 }