[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] linux-user: fix guest/host address mixup in i386 setup_rt_fr
From: |
Laurent Vivier |
Subject: |
Re: [PATCH] linux-user: fix guest/host address mixup in i386 setup_rt_frame() |
Date: |
Thu, 5 Aug 2021 12:17:03 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 |
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