diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2018-04-16 12:22:24 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2018-04-23 07:57:16 +0200 |
| commit | 783c3b53b9506db3e05daacfe34e0287eebb09d8 (patch) | |
| tree | 0387a2112939da7c54f38fb0715217fdc9768254 /arch/s390 | |
| parent | af2e460ade0b0180d0f3812ca4f4f59cc9597f3e (diff) | |
| download | linux-stable-783c3b53b9506db3e05daacfe34e0287eebb09d8.tar.gz linux-stable-783c3b53b9506db3e05daacfe34e0287eebb09d8.tar.bz2 linux-stable-783c3b53b9506db3e05daacfe34e0287eebb09d8.zip | |
s390/uprobes: implement arch_uretprobe_is_alive()
Implement s390 specific arch_uretprobe_is_alive() to avoid SIGSEGVs
observed with uretprobes in combination with setjmp/longjmp.
See commit 2dea1d9c38e4 ("powerpc/uprobes: Implement
arch_uretprobe_is_alive()") for more details.
With this implemented all test cases referenced in the above commit
pass.
Reported-by: Ziqian SUN <zsun@redhat.com>
Cc: <stable@vger.kernel.org> # v4.3+
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/uprobes.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/s390/kernel/uprobes.c b/arch/s390/kernel/uprobes.c index d9d1f512f019..5007fac01bb5 100644 --- a/arch/s390/kernel/uprobes.c +++ b/arch/s390/kernel/uprobes.c @@ -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) |