[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/15] linux-user/s390x: Mask si_addr for SIGSEGV
From: |
riku . voipio |
Subject: |
[Qemu-devel] [PULL 11/15] linux-user/s390x: Mask si_addr for SIGSEGV |
Date: |
Mon, 20 Nov 2017 23:21:39 +0200 |
From: Peter Maydell <address@hidden>
For s390x, the address passed to a signal handler in the
siginfo_t si_addr field is masked (in the kernel this is done in
do_sigbus() and do_sigsegv() in arch/s390/mm/fault.c). Implement
this architecture-specific oddity in linux-user.
This is one of the issues described in
https://bugs.launchpad.net/qemu/+bug/1705118
Reviewed-by: Laurent Vivier <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
---
linux-user/main.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/linux-user/main.c b/linux-user/main.c
index aa02f25b85..b6dd9efd2d 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -3238,6 +3238,10 @@ void cpu_loop(CPUAlphaState *env)
#endif /* TARGET_ALPHA */
#ifdef TARGET_S390X
+
+/* s390x masks the fault address it reports in si_addr for SIGSEGV and SIGBUS
*/
+#define S390X_FAIL_ADDR_MASK -4096LL
+
void cpu_loop(CPUS390XState *env)
{
CPUState *cs = CPU(s390_env_get_cpu(env));
@@ -3294,7 +3298,7 @@ void cpu_loop(CPUS390XState *env)
sig = TARGET_SIGSEGV;
/* XXX: check env->error_code */
n = TARGET_SEGV_MAPERR;
- addr = env->__excp_addr;
+ addr = env->__excp_addr & S390X_FAIL_ADDR_MASK;
goto do_signal;
case PGM_EXECUTE:
case PGM_SPECIFICATION:
--
2.14.2
- [Qemu-devel] [PULL 00/15] late linux-user fixes for 2.11, riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 01/15] linux-user: Restrict usage of sa_restorer, riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 03/15] linux-user/hppa: Fix cpu_clone_regs, riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 04/15] linux-user/hppa: Fix typo for TARGET_NR_epoll_wait, riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 02/15] linux-user/hppa: Fix TARGET_SA_* defines, riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 05/15] linux-user/hppa: Fix TARGET_MAP_TYPE, riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 06/15] linux-user/hppa: Fix TARGET_F_RDLCK, TARGET_F_WRLCK, TARGET_F_UNLCK, riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 08/15] linux-user/syscall.c: Handle SH4's exceptional alignment for p{read, write}64, riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 11/15] linux-user/s390x: Mask si_addr for SIGSEGV,
riku . voipio <=
- [Qemu-devel] [PULL 07/15] linux-user: Handle TARGET_MAP_STACK and TARGET_MAP_HUGETLB, riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 09/15] linux-user: fix 'finshed' typo in comment, riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 10/15] linux-user: return EINVAL from prctl(PR_*_SECCOMP), riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 12/15] linux-user/ppc: Report correct fault address for data faults, riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 13/15] linux-user/sparc: Put address for data faults where linux-user expects it, riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 14/15] linux-user: Handle rt_sigaction correctly for SPARC, riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 15/15] linux-user: Fix calculation of auxv length, riku . voipio, 2017/11/20
- Re: [Qemu-devel] [PULL 00/15] late linux-user fixes for 2.11, no-reply, 2017/11/20
- Re: [Qemu-devel] [PULL 00/15] late linux-user fixes for 2.11, Peter Maydell, 2017/11/21
- Re: [Qemu-devel] [PULL 00/15] late linux-user fixes for 2.11, no-reply, 2017/11/21