From: Andreas Krebbel <krebbel@linux.ibm.com>
To: qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org, richard.henderson@linaro.org, laurent@vivier.eu
Subject: [PATCH v2] linux-user/s390x: Use the guest pointer for the sigreturn stub
Date: Wed, 24 Mar 2021 16:55:30 +0100 [thread overview]
Message-ID: <20210324155530.52239-1-krebbel@linux.ibm.com> (raw)
In-Reply-To: <be03acc3-8e9f-4715-6936-68013c49b920@vivier.eu>
When setting up the pointer for the sigreturn stub in the return
address register (r14) we have to use the guest frame pointer instead
of the host frame pointer.
Note: This only caused problems if Qemu has been built with
--disable-pie (as it is in distros nowadays). Otherwise guest_base
defaults to 0 hiding the actual problem.
Signed-off-by: Andreas Krebbel <krebbel@linux.ibm.com>
---
linux-user/s390x/signal.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/linux-user/s390x/signal.c b/linux-user/s390x/signal.c
index ecfa2a14a9..e9bf865074 100644
--- a/linux-user/s390x/signal.c
+++ b/linux-user/s390x/signal.c
@@ -213,7 +213,8 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
if (ka->sa_flags & TARGET_SA_RESTORER) {
env->regs[14] = (unsigned long) ka->sa_restorer | PSW_ADDR_AMODE;
} else {
- env->regs[14] = (unsigned long) frame->retcode | PSW_ADDR_AMODE;
+ env->regs[14] = (target_ulong) (frame_addr + offsetof(rt_sigframe, retcode))
+ | PSW_ADDR_AMODE;
__put_user(S390_SYSCALL_OPCODE | TARGET_NR_rt_sigreturn,
(uint16_t *)(frame->retcode));
}
--
2.30.2
next prev parent reply other threads:[~2021-03-24 15:57 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-24 8:51 [PATCH 1/1] linux-user/s390x: Apply h2g to address of sigreturn stub Andreas Krebbel
2021-03-24 9:17 ` David Hildenbrand
2021-03-24 10:28 ` Laurent Vivier
2021-03-24 11:26 ` Andreas Krebbel
2021-03-24 13:06 ` Laurent Vivier
2021-03-24 14:14 ` Andreas Krebbel
2021-03-24 14:34 ` Richard Henderson
2021-03-24 15:34 ` Laurent Vivier
2021-03-24 15:55 ` Andreas Krebbel [this message]
2021-03-24 17:53 ` [PATCH v2] linux-user/s390x: Use the guest pointer for the " Laurent Vivier
2021-03-24 18:48 ` Andreas Krebbel
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=20210324155530.52239-1-krebbel@linux.ibm.com \
--to=krebbel@linux.ibm.com \
--cc=laurent@vivier.eu \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
/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).