Commit 59ebb6e4 authored by Michael Karcher's avatar Michael Karcher Committed by Laurent Vivier
Browse files

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: default avatarMichael Karcher <karcher@physik.fu-berlin.de>
Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
Message-Id: <20170225110517.2832-3-laurent@vivier.eu>
parent 3219de45

linux-user/signal.c

+1 −2
Original line number Diff line number Diff line
@@ -5851,14 +5851,13 @@ long do_rt_sigreturn(CPUM68KState *env) 
{

    struct target_rt_sigframe *frame;

    abi_ulong frame_addr = env->aregs[7] - 4;

    target_sigset_t target_set;

    sigset_t set;



    trace_user_do_rt_sigreturn(env, frame_addr);

    if (!lock_user_struct(VERIFY_READ, frame, frame_addr, 1))

        goto badframe;



    target_to_host_sigset_internal(&set, &target_set);

    target_to_host_sigset(&set, &frame->uc.tuc_sigmask);

    set_sigmask(&set);



    /* restore registers */