diff options
| author | Ilya Leoshkevich <iii@linux.ibm.com> | 2022-05-04 00:51:56 +0200 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2022-05-23 22:52:27 +0200 |
| commit | 9a12adc704f977b31d6cde6cb26e5424c128907b (patch) | |
| tree | ab59eab1eec9ed0ea43eb0f48f9c533e435654ab /linux-user | |
| parent | 0effdc29b53240b1b2f25e48a61a287558e8ad6f (diff) | |
| download | focaccia-qemu-9a12adc704f977b31d6cde6cb26e5424c128907b.tar.gz focaccia-qemu-9a12adc704f977b31d6cde6cb26e5424c128907b.zip | |
linux-user/s390x: Fix unwinding from signal handlers
Commit 31330e6cecfd ("linux-user/s390x: Implement setup_sigtramp")
removed an unused field from rt_sigframe, disturbing offsets of other
fields and breaking unwinding from signal handlers (e.g. libgcc's
s390_fallback_frame() relies on this struct having a specific layout).
Restore the field and add a comment.
Reported-by: Ulrich Weigand <ulrich.weigand@de.ibm.com>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Fixes: 31330e6cecfd ("linux-user/s390x: Implement setup_sigtramp")
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220503225157.1696774-2-iii@linux.ibm.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/s390x/signal.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/linux-user/s390x/signal.c b/linux-user/s390x/signal.c index f47713e04a..4979c4b017 100644 --- a/linux-user/s390x/signal.c +++ b/linux-user/s390x/signal.c @@ -84,6 +84,11 @@ struct target_ucontext { typedef struct { uint8_t callee_used_stack[__SIGNAL_FRAMESIZE]; + /* + * This field is no longer initialized by the kernel, but it's still a part + * of the ABI. + */ + uint16_t svc_insn; struct target_siginfo info; struct target_ucontext uc; } rt_sigframe; |