falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux-user: fix do_rt_sigreturn on m68k linux userspace emulation 

do_rt_sigreturn uses an uninitialised local variable instead of fetching
the old signal mask directly from the signal frame when restoring the mask,
so the signal mask is undefined after do_rt_sigreturn. As the signal
frame data is in target-endian order, target_to_host_sigset instead of
target_to_host_sigset_internal is required.

do_sigreturn is correct in using target_to_host_sigset_internal, because
get_user already did the endianness conversion.

Signed-off-by: Michael Karcher <karcher@physik.fu-berlin.de>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20170225110517.2832-3-laurent@vivier.eu>
This commit is contained in:
Michael Karcher 2017-02-25 12:05:17 +01:00 committed by Laurent Vivier
parent 3219de458c
commit 59ebb6e451
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
linux-user/signal.c
View File

@ -5851,14 +5851,13 @@ long do_rt_sigreturn(CPUM68KState *env)
{ {
struct target_rt_sigframe *frame; struct target_rt_sigframe *frame;
abi_ulong frame_addr = env->aregs[7] - 4; abi_ulong frame_addr = env->aregs[7] - 4;
target_sigset_t target_set;
sigset_t set; sigset_t set;
trace_user_do_rt_sigreturn(env, frame_addr); trace_user_do_rt_sigreturn(env, frame_addr);
if (!lock_user_struct(VERIFY_READ, frame, frame_addr, 1)) if (!lock_user_struct(VERIFY_READ, frame, frame_addr, 1))
goto badframe; goto badframe;
target_to_host_sigset_internal(&set, &target_set); target_to_host_sigset(&set, &frame->uc.tuc_sigmask);
set_sigmask(&set); set_sigmask(&set);
/* restore registers */ /* restore registers */