From patchwork Sat Feb 25 11:05:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 732356 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vVlbv5fY5z9s82 for ; Sat, 25 Feb 2017 22:09:31 +1100 (AEDT) Received: from localhost ([::1]:42125 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chaED-0002pE-9y for incoming@patchwork.ozlabs.org; Sat, 25 Feb 2017 06:09:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45181) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chaAO-0007ao-EO for qemu-devel@nongnu.org; Sat, 25 Feb 2017 06:05:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chaAM-0007dN-Jy for qemu-devel@nongnu.org; Sat, 25 Feb 2017 06:05:32 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:52387) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1chaAM-0007az-9P for qemu-devel@nongnu.org; Sat, 25 Feb 2017 06:05:30 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MW7C9-1cnpX73ivJ-00XH1O; Sat, 25 Feb 2017 12:05:21 +0100 From: Laurent Vivier To: Riku Voipio Date: Sat, 25 Feb 2017 12:05:17 +0100 Message-Id: <20170225110517.2832-3-laurent@vivier.eu> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170225110517.2832-1-laurent@vivier.eu> References: <20170225110517.2832-1-laurent@vivier.eu> X-Provags-ID: V03:K0:HXjGLp+yEnxGBGoUphcAKypJcx7Gx1kz2ROJWk3I/ltmyz9yNX3 pWNrZXZ6e8WOl01eGun3jyUOHdPfX5ZC0Syr+Nn+snQraShZpVRwogNOvCyB684cvZ31o0C 6ZPjdQ7Zqgr+YmQn9nHv0KTV34Pdy8FewGl1A+rE0soROPqMHywgmDeSSMUi+GZXea2YxCp lAXjFTWngwtDT/u0eN/EQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:4WngyV9o8XI=:hXR1UP53L5r3Ob56+pbj4v nDVWa5K5/Wubj8h4lZ14sUME9j7i/M0a9FgERuA7F8R00UR5M8lbpTo5t+zDPjbBoKnHEXo2k imz/MsK4n1d6IM/+DQPAWWdBiY0VDlfg/Jx90BmlenYqkJ0JPbVecqnN383mq3zXTMTiz26ih WAtGxtPQmGOorrefv8RMKJvYS196WtkYrMI5Y98p9lklFVOkxcq0M3bjj2pzDBLoEo6AVOdZ7 QjQ4qtzWGzDw2vqpvhjRAz1r4++y9e3MvoY738tfFsZkubqTqrw33R4mHhBqrNqG1n6Wm+ZbW FpG36hTXpfeeBRtW9SzMVFx8J3gM+hCNG8+Xj1r7g2dxVzmhvQYXby8RLQfBZn8NCs/n5SP0w S7HpbUsEIrGywXaXsB3AVnkS7r4E7lR51XIoJeA0994w9EnzSOchp3mP+CzwKNjGXBBrbnxRa mfOlaePTXUwyaHB0TjM3RF06GV4v4/F860dMiI540dglL/T1IwoRuZmL/sI3jUE/vndhVwYPi PO8eD4CfWe7FkILcXE6lkR94R7X63HvMBbRkEp/z8sO5aWZ90bSYELDJzSO1PUmD10bUzTIIN xlcg1CWUIvc4uga+8OR3spWf3BnfgcV+Q+z1FXDsW6nLdo+VynMnsXMbgwK2S8tE4obMfZF2M B4oiYi6xpmCxpE2dylTk92h4+xm+dQ/OmUm11QJgGg4dJanBBtpYBMleV4xcZq+NdByw= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.135 Subject: [Qemu-devel] [PATCH 2/2] linux-user: fix do_rt_sigreturn on m68k linux userspace emulation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Karcher , qemu-devel@nongnu.org, Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Michael Karcher 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 Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- linux-user/signal.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index df452ba..8382561 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -5670,14 +5670,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 */