Skip to contentSkip to conversation

Patch "MIPS: fix uretprobe implementation" has been added to the 4.7-stable tree

PATCH [email protected] 1 participant 1 message Oct 5, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

MIPS: fix uretprobe implementation

to the 4.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mips-fix-uretprobe-implementation.patch
and it can be found in the queue-4.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From db06068a4fd44a57b642b369d2a295b8448f6b65 Mon Sep 17 00:00:00 2001

From: Marcin Nowakowski <[email protected]>
Date: Thu, 22 Sep 2016 15:38:31 +0200
Subject: MIPS: fix uretprobe implementation

From: Marcin Nowakowski <[email protected]>

commit db06068a4fd44a57b642b369d2a295b8448f6b65 upstream.

arch_uretprobe_hijack_return_addr should replace the return address for a call with a trampoline address.

Fixes 40e084a506eb ('MIPS: Add uprobes support.')

Patchwork: https://patchwork.linux-mips.org/patch/14298/

---
 arch/mips/kernel/uprobes.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/kernel/uprobes.c +1 -1
@@ -257,7 +257,7 @@ unsigned long arch_uretprobe_hijack_retu
 	ra = regs->regs[31];
 
 	/* Replace the return address with the trampoline address */
-	regs->regs[31] = ra;
+	regs->regs[31] = trampoline_vaddr;
 
 	return ra;
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.7/mips-uprobes-fix-use-of-uninitialised-variable.patch queue-4.7/mips-fix-uretprobe-implementation.patch queue-4.7/mips-uprobes-remove-incorrect-set_orig_insn.patch