* [PATCH] linux-user: fix guest/host address mixup in i386 setup_rt_frame()
@ 2021-08-03 17:18 Ilya Leoshkevich
2021-08-03 21:03 ` Richard Henderson
2021-08-05 10:17 ` Laurent Vivier
0 siblings, 2 replies; 3+ messages in thread
From: Ilya Leoshkevich @ 2021-08-03 17:18 UTC (permalink / raw)
To: Laurent Vivier
Cc: Christian Borntraeger, qemu-devel, Ilya Leoshkevich,
Andreas Krebbel
setup_rt_frame() passes siginfo and ucontext host addresses to guest
signal handlers, causing problems when e.g. emulating x86_64 on s390x.
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
linux-user/i386/signal.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/linux-user/i386/signal.c b/linux-user/i386/signal.c
index 8701774e37..841cd19651 100644
--- a/linux-user/i386/signal.c
+++ b/linux-user/i386/signal.c
@@ -436,13 +436,13 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
#ifndef TARGET_X86_64
env->regs[R_EAX] = sig;
- env->regs[R_EDX] = (unsigned long)&frame->info;
- env->regs[R_ECX] = (unsigned long)&frame->uc;
+ env->regs[R_EDX] = frame_addr + offsetof(struct rt_sigframe, info);
+ env->regs[R_ECX] = frame_addr + offsetof(struct rt_sigframe, uc);
#else
env->regs[R_EAX] = 0;
env->regs[R_EDI] = sig;
- env->regs[R_ESI] = (unsigned long)&frame->info;
- env->regs[R_EDX] = (unsigned long)&frame->uc;
+ env->regs[R_ESI] = frame_addr + offsetof(struct rt_sigframe, info);
+ env->regs[R_EDX] = frame_addr + offsetof(struct rt_sigframe, uc);
#endif
cpu_x86_load_seg(env, R_DS, __USER_DS);
--
2.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] linux-user: fix guest/host address mixup in i386 setup_rt_frame()
2021-08-03 17:18 [PATCH] linux-user: fix guest/host address mixup in i386 setup_rt_frame() Ilya Leoshkevich
@ 2021-08-03 21:03 ` Richard Henderson
2021-08-05 10:17 ` Laurent Vivier
1 sibling, 0 replies; 3+ messages in thread
From: Richard Henderson @ 2021-08-03 21:03 UTC (permalink / raw)
To: Ilya Leoshkevich, Laurent Vivier
Cc: Christian Borntraeger, qemu-devel, Andreas Krebbel
On 8/3/21 7:18 AM, Ilya Leoshkevich wrote:
> setup_rt_frame() passes siginfo and ucontext host addresses to guest
> signal handlers, causing problems when e.g. emulating x86_64 on s390x.
>
> Signed-off-by: Ilya Leoshkevich<iii@linux.ibm.com>
> ---
> linux-user/i386/signal.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] linux-user: fix guest/host address mixup in i386 setup_rt_frame()
2021-08-03 17:18 [PATCH] linux-user: fix guest/host address mixup in i386 setup_rt_frame() Ilya Leoshkevich
2021-08-03 21:03 ` Richard Henderson
@ 2021-08-05 10:17 ` Laurent Vivier
1 sibling, 0 replies; 3+ messages in thread
From: Laurent Vivier @ 2021-08-05 10:17 UTC (permalink / raw)
To: Ilya Leoshkevich; +Cc: Christian Borntraeger, qemu-devel, Andreas Krebbel
Le 03/08/2021 à 19:18, Ilya Leoshkevich a écrit :
> setup_rt_frame() passes siginfo and ucontext host addresses to guest
> signal handlers, causing problems when e.g. emulating x86_64 on s390x.
>
> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
> ---
> linux-user/i386/signal.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/linux-user/i386/signal.c b/linux-user/i386/signal.c
> index 8701774e37..841cd19651 100644
> --- a/linux-user/i386/signal.c
> +++ b/linux-user/i386/signal.c
> @@ -436,13 +436,13 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
>
> #ifndef TARGET_X86_64
> env->regs[R_EAX] = sig;
> - env->regs[R_EDX] = (unsigned long)&frame->info;
> - env->regs[R_ECX] = (unsigned long)&frame->uc;
> + env->regs[R_EDX] = frame_addr + offsetof(struct rt_sigframe, info);
> + env->regs[R_ECX] = frame_addr + offsetof(struct rt_sigframe, uc);
> #else
> env->regs[R_EAX] = 0;
> env->regs[R_EDI] = sig;
> - env->regs[R_ESI] = (unsigned long)&frame->info;
> - env->regs[R_EDX] = (unsigned long)&frame->uc;
> + env->regs[R_ESI] = frame_addr + offsetof(struct rt_sigframe, info);
> + env->regs[R_EDX] = frame_addr + offsetof(struct rt_sigframe, uc);
> #endif
>
> cpu_x86_load_seg(env, R_DS, __USER_DS);
>
Applied to my linux-user-for-6.1 branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-08-05 10:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-03 17:18 [PATCH] linux-user: fix guest/host address mixup in i386 setup_rt_frame() Ilya Leoshkevich
2021-08-03 21:03 ` Richard Henderson
2021-08-05 10:17 ` Laurent Vivier
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).