From patchwork Mon Feb 27 22:33:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 9594381 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 43CD160453 for ; Mon, 27 Feb 2017 22:39:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 35B3C26CF9 for ; Mon, 27 Feb 2017 22:39:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A5A428236; Mon, 27 Feb 2017 22:39:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9012326CF9 for ; Mon, 27 Feb 2017 22:39:16 +0000 (UTC) Received: from localhost ([::1]:57312 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ciTwp-0005Q1-8r for patchwork-qemu-devel@patchwork.kernel.org; Mon, 27 Feb 2017 17:39:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39822) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ciTrn-0001WK-5W for qemu-devel@nongnu.org; Mon, 27 Feb 2017 17:34:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ciTrj-0004fo-1r for qemu-devel@nongnu.org; Mon, 27 Feb 2017 17:34:03 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:64160) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ciTri-0004Y8-NU for qemu-devel@nongnu.org; Mon, 27 Feb 2017 17:33:58 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MGiBd-1cVXRW3oAL-00DTzi; Mon, 27 Feb 2017 23:33:44 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 27 Feb 2017 23:33:36 +0100 Message-Id: <20170227223337.17434-6-laurent@vivier.eu> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170227223337.17434-1-laurent@vivier.eu> References: <20170227223337.17434-1-laurent@vivier.eu> X-Provags-ID: V03:K0:M/up4JArpKtkrq7AQRwUUk7hkTYhx+aLkFHGF3jGFkrlGRHLyzU Gy8FzmweIz1IedJCCKqTyXCZI5oiMBwj82DQSGg3jihQkAl+PCQ6s3oT21hGG7xQDXWMALj 8VK8JAxaXV1l5nsc2iQMfXmGjq+HJpoMQbi0aj35OgCVuO4joxsqdqL0q6YluHnZivuTam1 43pf5+s295pVUrpNwWQPA== X-UI-Out-Filterresults: notjunk:1; V01:K0:EcLbwgxqEvU=:kxj2IcQKLG54ETB5PDfwgr Q714WPO1e2iSl0/MAeIsuBKui6jM+4X0rKqWMjmerwCnKYa4HFz40Bn1jGGxg01pzmmUr04Hu folTSewu912PXDf8KceBGNItmyVhNWZ7qo+pJw3cxh6g+9Bktdpj7FNU8si/s0RLXhzsVltbW Zqz12c5yvmvcsMDP9YRmZBgK2jlZ0iSyMJEkOW1kS7CcQDMWczTMAVb2ivKu8DJ9rQom0XZYG PKAwCcm7uyMQpJ44uQBctC7mZrTmusBEvElqNbgeBbo4leu+z4Qu8hQOovLb+y6jWyuN7ufCo cL9LoFhhVh2vrvsnbAtq5fY4b7yYaMpPRe9a4doSsdouZCQk7jlwAvSlz5Es3H1Liuvtz2RFH Wqpxjfh7bKvXDPFAnyuTnkKcvZtowy+d8uw6zqTpQKbLrIQSJzlqbCNDAuVfa4miMbxujysCl Ek4E+oAzTguP0nDnkXi51O8GftvSgyFGpW9RsoZfCXbq4pbC/P28dJM2VEjXpz6tS594Wzld1 8B6YxrKm+iFvoQeOteUedewyFukDuAswIPN6kJrZDGdw/hynUakoAN+gni9oKQEkl+C/unzw1 COQxaMgBdfiEfc9NaV7zIKVd/bQri9DoY+pka9P//zrQKZmmyAA5bLCNY5AxcDxe/h551FPCj nEk1cJ48PxzJQWQgbaGSJK91xpMcgsRihK9cA9/EMv2nfJy3v9boL5tfEhZfoycF5B1M= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.74 Subject: [Qemu-devel] [PULL 5/6] 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: Riku Voipio , Michael Karcher , Laurent Vivier Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Message-Id: <20170225110517.2832-3-laurent@vivier.eu> --- 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 99adfc2..a67db04 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -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 */