Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c371fe01 authored by Heiko Carstens's avatar Heiko Carstens Committed by Greg Kroah-Hartman
Browse files

s390/uprobes: implement arch_uretprobe_is_alive() 



commit 783c3b53b9506db3e05daacfe34e0287eebb09d8 upstream.

Implement s390 specific arch_uretprobe_is_alive() to avoid SIGSEGVs
observed with uretprobes in combination with setjmp/longjmp.

See commit 2dea1d9c ("powerpc/uprobes: Implement
arch_uretprobe_is_alive()") for more details.

With this implemented all test cases referenced in the above commit
pass.

Reported-by: default avatarZiqian SUN <zsun@redhat.com>
Cc: <stable@vger.kernel.org> # v4.3+
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5dad5105

arch/s390/kernel/uprobes.c

+9 −0
Original line number Diff line number Diff line
@@ -150,6 +150,15 @@ unsigned long arch_uretprobe_hijack_return_addr(unsigned long trampoline, 
	return orig;

}



bool arch_uretprobe_is_alive(struct return_instance *ret, enum rp_check ctx,

			     struct pt_regs *regs)

{

	if (ctx == RP_CHECK_CHAIN_CALL)

		return user_stack_pointer(regs) <= ret->stack;

	else

		return user_stack_pointer(regs) < ret->stack;

}



/* Instruction Emulation */



static void adjust_psw_addr(psw_t *psw, unsigned long len)