From: Ilya Leoshkevich <iii@linux.ibm.com>
To: Richard Henderson <richard.henderson@linaro.org>,
David Hildenbrand <david@redhat.com>,
Laurent Vivier <laurent@vivier.eu>
Cc: qemu-s390x@nongnu.org, qemu-devel@nongnu.org,
Christian Borntraeger <borntraeger@linux.ibm.com>,
Ulrich Weigand <ulrich.weigand@de.ibm.com>,
Ilya Leoshkevich <iii@linux.ibm.com>
Subject: [PATCH 1/2] linux-user/s390x: Fix unwinding from signal handlers
Date: Wed, 4 May 2022 00:51:56 +0200 [thread overview]
Message-ID: <20220503225157.1696774-2-iii@linux.ibm.com> (raw)
In-Reply-To: <20220503225157.1696774-1-iii@linux.ibm.com>
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")
---
linux-user/s390x/signal.c | 5 +++++
1 file changed, 5 insertions(+)
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;
--
2.35.1
next prev parent reply other threads:[~2022-05-03 23:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-03 22:51 [PATCH 0/2] linux-user/s390x: Fix unwinding from signal handlers Ilya Leoshkevich
2022-05-03 22:51 ` Ilya Leoshkevich [this message]
2022-05-08 0:38 ` [PATCH 1/2] " David Hildenbrand
2022-05-08 2:17 ` Richard Henderson
2022-05-03 22:51 ` [PATCH 2/2] tests/tcg/s390x: Test " Ilya Leoshkevich
2022-05-19 11:34 ` PING: " Ilya Leoshkevich
2022-05-24 9:56 ` Thomas Huth
2022-05-24 16:07 ` Laurent Vivier
2022-05-23 20:52 ` [PATCH 0/2] linux-user/s390x: Fix " Laurent Vivier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220503225157.1696774-2-iii@linux.ibm.com \
--to=iii@linux.ibm.com \
--cc=borntraeger@linux.ibm.com \
--cc=david@redhat.com \
--cc=laurent@vivier.eu \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=ulrich.weigand@de.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).