linux-user: fix guest/host address mixup in i386 setup_rt_frame()
PATCH 1/1 linux-user: fix guest/host address mixup in i386 setup_rt_frame()
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 <[email protected]>
--- linux-user/i386/signal.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
linux-user/i386/signal.c +4 -4
@@ -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);
Signature · 1 line
2.31.1
Quoted 7 lines · Ilya Leoshkevich
setup_rt_frame()passes siginfo and ucontext host addresses to guest signal handlers, causing problems when e.g. emulatingx86_64on s390x.Signed-off-by Ilya Leoshkevich<[email protected]>--- linux-user/i386/signal.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Reviewed-by Richard Henderson <[email protected]>
r~
Laurent Vivier
AppliedLe 03/08/2021 à 19:18, Ilya Leoshkevich a écrit :
Quoted 21 lines
setup_rt_frame()passes siginfo and ucontext host addresses to guest signal handlers, causing problems when e.g. emulatingx86_64on s390x.Signed-off-by Ilya Leoshkevich <[email protected]>--- linux-user/i386/signal.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)linux-user/i386/signal.c +2
-2@@ -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);
linux-user/i386/signal.c void setup_rt_frame(int sig, struct target_sigaction *ka, · line 448
Quoted 10 lines
linux-user/i386/signal.c +2
-2#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