From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55628) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6lkw-0003Od-10 for qemu-devel@nongnu.org; Wed, 09 Dec 2015 15:54:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a6lkt-00018q-9f for qemu-devel@nongnu.org; Wed, 09 Dec 2015 15:54:33 -0500 Received: from outpost1.zedat.fu-berlin.de ([130.133.4.66]:50122) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6lkt-00018j-48 for qemu-devel@nongnu.org; Wed, 09 Dec 2015 15:54:31 -0500 From: Michael Karcher Date: Wed, 9 Dec 2015 21:54:17 +0100 Message-Id: <1449694457-5843-2-git-send-email-karcher@physik.fu-berlin.de> In-Reply-To: <1449694457-5843-1-git-send-email-karcher@physik.fu-berlin.de> References: <1449694457-5843-1-git-send-email-karcher@physik.fu-berlin.de> Subject: [Qemu-devel] [PATCH 1/1] Fix do_rt_sigreturn on m68k linux userspace emulation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Riku Voipio , Laurent Vivier , qemu-devel@nongnu.org Cc: glaubitz@physik.fu-berlin.de do_rt_sigreturn forgets to initialize the signal mask variable before trying to use it to restore the mask, so the signal mask is undefined after do_rt_sigreturn. This bug has been in all the time since 7181155d when do_rt_sigreturn was implemented for m68k. Signed-off-by: Michael Karcher --- linux-user/signal.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index e03ed60..ae1014b 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -5260,11 +5260,14 @@ long do_rt_sigreturn(CPUM68KState *env) abi_ulong frame_addr = env->aregs[7] - 4; target_sigset_t target_set; sigset_t set; - int d0; + int d0, i; if (!lock_user_struct(VERIFY_READ, frame, frame_addr, 1)) goto badframe; + for(i = 0; i < TARGET_NSIG_WORDS; i++) { + target_set.sig[i] = frame->uc.tuc_sigmask.sig[i]; + } target_to_host_sigset_internal(&set, &target_set); do_sigprocmask(SIG_SETMASK, &set, NULL); -- 2.1.4