Commit 09bc20c8 authored by Vasily Gorbik's avatar Vasily Gorbik
Browse files

s390/kprobes: enable kretprobes framepointer verification 



Use regs->gprs[15] for framepointer verification. This enables
additional sanity checks for nested kretprobes.

Reviewed-by: default avatarTobias Huschle <huschle@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 0b452520

arch/s390/kernel/kprobes.c

+4 −4
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ NOKPROBE_SYMBOL(pop_kprobe); 
void arch_prepare_kretprobe(struct kretprobe_instance *ri, struct pt_regs *regs)

{

	ri->ret_addr = (kprobe_opcode_t *)regs->gprs[14];

	ri->fp = NULL;

	ri->fp = (void *)regs->gprs[15];



	/* Replace the return addr with trampoline addr */

	regs->gprs[14] = (unsigned long)&__kretprobe_trampoline;
@@ -385,7 +385,7 @@ NOKPROBE_SYMBOL(arch_kretprobe_fixup_return); 
 */

void trampoline_probe_handler(struct pt_regs *regs)

{

	kretprobe_trampoline_handler(regs, NULL);

	kretprobe_trampoline_handler(regs, (void *)regs->gprs[15]);

}

NOKPROBE_SYMBOL(trampoline_probe_handler);