From nobody Thu May 2 17:56:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 14880208212901020.5428492752771; Sat, 25 Feb 2017 03:07:01 -0800 (PST) Received: from localhost ([::1]:42110 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chaBn-0008FI-U2 for importer@patchew.org; Sat, 25 Feb 2017 06:06:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45182) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chaAO-0007ap-Ea 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 1chaAL-0007an-3j for qemu-devel@nongnu.org; Sat, 25 Feb 2017 06:05:32 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:49181) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1chaAK-0007ZX-Pk for qemu-devel@nongnu.org; Sat, 25 Feb 2017 06:05:29 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LbO0s-1c2Rqc1Wwc-00kyJd; Sat, 25 Feb 2017 12:05:20 +0100 From: Laurent Vivier To: Riku Voipio Date: Sat, 25 Feb 2017 12:05:16 +0100 Message-Id: <20170225110517.2832-2-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:36lckqh63Lj/jO8PAULwMnmGHn9jBvIAIUJZ+P/Zn0f6Qlr+elo 1IX/nCIYTZzYcVD74VEg2T4V1UnucTDuR4JL5/Sv6pFkBzVWmmhAOTFaeAxECzThGpXY7Kj Roaw8GPIh6Zj+PaI4BFaUsgugcKW3IUHEqohHH/51zQlc02Mi3lPK230GKXjZ+GzSQj9s30 vdEPQ69Xg0ExKhIU3yphQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:Pwn5aqMM2fM=:BLUFcg8EtgQQpUL1oE6yXc n6XBEWK/8Z02xHTGHAdhguHcIlaqPC7+rYeFOaE0fH/LvQXg8CAeA+BsxYw2VFWSiHuPCy09N 38k5ZCovohORHtyP6Fz8ZSxdfsPECkVr5j0tQ/Ty6A+5Zf9mkDRBgqYG1Xy7IDvw9aSl+qPau d3k0f2gE5ExD9DPs/TfcQoIa3ZS1g4zhoAi1D5CNmdyxdRPcUMVEZwGA7pVfdr4eBaK7nSkjd m/238nKdyYPDOzizvOccFlSK3wqD1vdYpGfp4wFXMsDT5MGWE1iEST4fkqwZa5Be1fJdFfrao CkuP64hwBV/RSWdi3ZWleB3Gll6BnICR2MeqkpQpqlpV/P+0klkcVSwKHWhuE9TCfjFbitIg4 fCr8NzGr6jWkpKvkwwMCyvVCEVTX+j3J2zMnHKRnnP5G4t7mXWWK+CvtPOSUXKk5TY/q8D9Af B6ll3FXUVprePC/Oy+fVShe3+miXhuGXovLCJ3aZY73m4xatOvJPN2YEYVkePJcmqKpdvgEUP qxbnQuNv/Ru6KU4RStY7gUo186l2+qF9XpddhXOwVKv+T4YfOVyoqBcFzWXYEz1WUT0gWW1Rq us+Y7DXfyAAsyQye/wYaPP/QMiFUUKceXxkNmS6Pyrxe/GBzBOqIhNE3CvNCeVs33VkFhPRy6 F9pdX3xL+lb8FNM/IrRVbdhpzgva37lcBzU1B74/mB1Ijv6vXG4OPDJm9oRyr2LS2mLo= 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 1/2] linux-user: correctly manage SR in ucontext 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: qemu-devel@nongnu.org, Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use cpu_m68k_get_ccr()/cpu_m68k_set_ccr() to setup and restore correctly the value of SR in the ucontext structure Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- linux-user/signal.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index 5064de0..df452ba 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -5495,6 +5495,7 @@ static inline int target_rt_setup_ucontext(struct tar= get_ucontext *uc, CPUM68KState *env) { target_greg_t *gregs =3D uc->tuc_mcontext.gregs; + uint32_t sr =3D cpu_m68k_get_ccr(env); =20 __put_user(TARGET_MCONTEXT_VERSION, &uc->tuc_mcontext.version); __put_user(env->dregs[0], &gregs[0]); @@ -5514,7 +5515,7 @@ static inline int target_rt_setup_ucontext(struct tar= get_ucontext *uc, __put_user(env->aregs[6], &gregs[14]); __put_user(env->aregs[7], &gregs[15]); __put_user(env->pc, &gregs[16]); - __put_user(env->sr, &gregs[17]); + __put_user(sr, &gregs[17]); =20 return 0; } @@ -5548,7 +5549,7 @@ static inline int target_rt_restore_ucontext(CPUM68KS= tate *env, __get_user(env->aregs[7], &gregs[15]); __get_user(env->pc, &gregs[16]); __get_user(temp, &gregs[17]); - env->sr =3D (env->sr & 0xff00) | (temp & 0xff); + cpu_m68k_set_ccr(env, temp); =20 return 0; =20 --=20 2.9.3 From nobody Thu May 2 17:56:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1488020983099661.2564884124158; Sat, 25 Feb 2017 03:09:43 -0800 (PST) Received: from localhost ([::1]:42125 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chaEP-0002pE-SF for importer@patchew.org; Sat, 25 Feb 2017 06:09:41 -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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 =3D env->aregs[7] - 4; - target_sigset_t target_set; sigset_t set; =20 trace_user_do_rt_sigreturn(env, frame_addr); if (!lock_user_struct(VERIFY_READ, frame, frame_addr, 1)) goto badframe; =20 - target_to_host_sigset_internal(&set, &target_set); + target_to_host_sigset(&set, &frame->uc.tuc_sigmask); set_sigmask(&set); =20 /* restore registers */ --=20 2.9.3