From: Laurent Vivier <laurent@vivier.eu>
To: Andreas Krebbel <krebbel@linux.ibm.com>, qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org, richard.henderson@linaro.org
Subject: Re: [PATCH v3] linux-user/s390x: Use the guest pointer for the sigreturn stub
Date: Thu, 25 Mar 2021 20:55:48 +0100 [thread overview]
Message-ID: <2b8d52a8-b72a-c968-f61a-2e6288ace4ad@vivier.eu> (raw)
In-Reply-To: <20210324185128.63971-1-krebbel@linux.ibm.com>
Le 24/03/2021 à 19:51, Andreas Krebbel a écrit :
> When setting up the pointer for the sigreturn stub in the return
> address register (r14) we currently use the host frame address instead
> of the guest frame address.
>
> 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 | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/linux-user/s390x/signal.c b/linux-user/s390x/signal.c
> index ecfa2a14a9..7107c5fb53 100644
> --- a/linux-user/s390x/signal.c
> +++ b/linux-user/s390x/signal.c
> @@ -211,9 +211,10 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
> /* Set up to return from userspace. If provided, use a stub
> already in userspace. */
> if (ka->sa_flags & TARGET_SA_RESTORER) {
> - env->regs[14] = (unsigned long) ka->sa_restorer | PSW_ADDR_AMODE;
> + env->regs[14] = ka->sa_restorer | PSW_ADDR_AMODE;
> } else {
> - env->regs[14] = (unsigned long) frame->retcode | PSW_ADDR_AMODE;
> + env->regs[14] = (frame_addr + offsetof(typeof(*frame), retcode))
> + | PSW_ADDR_AMODE;
> __put_user(S390_SYSCALL_OPCODE | TARGET_NR_rt_sigreturn,
> (uint16_t *)(frame->retcode));
> }
>
Applied to my linux-user-for-6.0 branch
Thanks,
Laurent
next prev parent reply other threads:[~2021-03-25 19:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-24 18:51 [PATCH v3] linux-user/s390x: Use the guest pointer for the sigreturn stub Andreas Krebbel
2021-03-25 10:42 ` Laurent Vivier
2021-03-25 12:46 ` Richard Henderson
2021-03-25 19:55 ` Laurent Vivier [this message]
2021-03-26 6:51 ` 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=2b8d52a8-b72a-c968-f61a-2e6288ace4ad@vivier.eu \
--to=laurent@vivier.eu \
--cc=krebbel@linux.ibm.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.