From patchwork Fri Aug 6 09:17:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1514238 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Gh0JB0C9Nz9sWc for ; Fri, 6 Aug 2021 19:18:02 +1000 (AEST) Received: from localhost ([::1]:52364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mBvzL-0002wY-BX for incoming@patchwork.ozlabs.org; Fri, 06 Aug 2021 05:17:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41876) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mBvyg-0002tb-Uh for qemu-devel@nongnu.org; Fri, 06 Aug 2021 05:17:19 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:46963) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mBvye-00057v-56 for qemu-devel@nongnu.org; Fri, 06 Aug 2021 05:17:18 -0400 Received: from quad ([82.142.6.46]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N5FxN-1nASiw3eDt-01197s; Fri, 06 Aug 2021 11:17:12 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 1/2] linux-user: fix guest/host address mixup in i386 setup_rt_frame() Date: Fri, 6 Aug 2021 11:17:08 +0200 Message-Id: <20210806091709.2465239-2-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210806091709.2465239-1-laurent@vivier.eu> References: <20210806091709.2465239-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:o7hkCkfneED8CJrExvUShojfZw2otOwJn/VyMxlDJue0hJpsQ+r l6uu+/qhwpUWFNAitUOn1jrH3KEnpEgk/h1CKasGOUBNWYfFrSvwJDoxwn82c0SXYeeojF9 ILTGpFX6idGKPUdRONHUU0PqJVFVLC1C/gSYJdyplHaE3A1lu/5ZQ7HX22LZBDKZY0QFShv XGovKCLjf29617QqJX5Lg== X-UI-Out-Filterresults: notjunk:1;V03:K0:jVYpc5RaYcc=:CUKurxdyagh4F4fcnocr9F GY6oll9KvJr1C1uT9QAOfqKa2VtOvtO/h5DpnVu/9Lkm7CJW5FQaiX93uhlbYO+V0QpinEgDM elgUKE+GwR909qTeyYmwnTlzxoSdeJCpsMnfgRLKadArPhgWBlti99sUFYtf10/ku0IstWCmz E6h4JxrBWC+EbLrMjImfca1sOC71MEETP3BIcNNmyZJ/+fDFnK3j3SEINOvZY08Kn4lfQuEgw HPB8R8O/c4HeGRAZBBtGOAmLmYxG0cM/JqPJ1YNXL/u5esLhyjQP2pCLQyqwe/GN16fCXzrXI I38h4wdI9abU7Ee0SbbZ9y9sZPhc+t7j2koW1Ybq6CLUanBDM1Xt9djWZ0F59KvGH3ZuK5N5+ to9z2SnLLd/sPEE/nw5gKmnLJE7gysBH9u/OOTVxB4IE7tslTPns1BHAz4DzuP6FTNlmQNFkq Hn9X37IB4spfhB7sN7vFYsPaCum67gcDG3QAxLGDmALyBVQZgnEWwDKBQ1bTbvmNr1285paKY dT6S7VLYqz/KwpRUHlWq71OlSlgcuEVa+lPxhcUrWZBlB4Q70XmAhWgt1W1Bby4V9bYDb2b9P 1Zo/ZqGk54dZZ+EAdk04Q9Cg1lasDynb6pF39el/nf4shb4crqzLGXsjN2hrGFJGlvA1cVyaP HJzdI8fA7YA3j33niHlAzWY6SoEBVkNxD/SsEYj83bmo8C0ef8D3sBToaT63lwu857VImWfy0 pbpsHUxX0tLU/EpPFLTSJmoZFmsKx8+K179TtKPSBoiDZKNCXNNS8PTeYc2vhp52W1JKozevZ 73HRpGShUMmONIWUC2g+yBwvMoZxeK26T5q0+gxAXyoJswkDXFjult666UyBT6or0qXd0o9 Received-SPF: none client-ip=212.227.126.133; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Laurent Vivier , Ilya Leoshkevich Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Ilya Leoshkevich setup_rt_frame() passes siginfo and ucontext host addresses to guest signal handlers, causing problems when e.g. emulating x86_64 on s390x. Signed-off-by: Ilya Leoshkevich Reviewed-by: Richard Henderson Message-Id: <20210803171858.148394-1-iii@linux.ibm.com> Signed-off-by: Laurent Vivier --- linux-user/i386/signal.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/linux-user/i386/signal.c b/linux-user/i386/signal.c index 8701774e3791..841cd1965100 100644 --- a/linux-user/i386/signal.c +++ b/linux-user/i386/signal.c @@ -436,13 +436,13 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, #ifndef TARGET_X86_64 env->regs[R_EAX] = sig; - env->regs[R_EDX] = (unsigned long)&frame->info; - env->regs[R_ECX] = (unsigned long)&frame->uc; + env->regs[R_EDX] = frame_addr + offsetof(struct rt_sigframe, info); + env->regs[R_ECX] = frame_addr + offsetof(struct rt_sigframe, uc); #else env->regs[R_EAX] = 0; env->regs[R_EDI] = sig; - env->regs[R_ESI] = (unsigned long)&frame->info; - env->regs[R_EDX] = (unsigned long)&frame->uc; + env->regs[R_ESI] = frame_addr + offsetof(struct rt_sigframe, info); + env->regs[R_EDX] = frame_addr + offsetof(struct rt_sigframe, uc); #endif cpu_x86_load_seg(env, R_DS, __USER_DS); From patchwork Fri Aug 6 09:17:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1514239 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Gh0KX3SN6z9sW5 for ; Fri, 6 Aug 2021 19:19:12 +1000 (AEST) Received: from localhost ([::1]:56484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mBw0U-0005gV-8d for incoming@patchwork.ozlabs.org; Fri, 06 Aug 2021 05:19:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mBvyj-0002ve-UX for qemu-devel@nongnu.org; Fri, 06 Aug 2021 05:17:21 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:55091) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mBvyh-0005AV-Ti for qemu-devel@nongnu.org; Fri, 06 Aug 2021 05:17:21 -0400 Received: from quad ([82.142.6.46]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mq2za-1mygri2Ol0-00nCuB; Fri, 06 Aug 2021 11:17:12 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 2/2] linux-user/elfload: byteswap i386 registers when dumping core Date: Fri, 6 Aug 2021 11:17:09 +0200 Message-Id: <20210806091709.2465239-3-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210806091709.2465239-1-laurent@vivier.eu> References: <20210806091709.2465239-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:ZW4AKMPGmn7bEQSOojYrJu32YF8rJ8PrQvKU6uCVik5227dQ3PT +IbTTOj4XuuPg8wYD0dOGdobyhpSSEHKX+G/FaVZQ4PY8edL075+PDCuYUu9twIJK3Nf3GX 1j/jvW/++YDe/wrHuUiOIS+8Ot9KXkxqZezaR2M649eqTePdhN/MAu5aJFciKHO15sKAZcp haAADWhJFra90+yYXpv0g== X-UI-Out-Filterresults: notjunk:1;V03:K0:dw1q8ZuVlXo=:138F6xG+SaWIwbAsHH0zSk 0xoJivTJnJvmtPsbO/QyvDQNtlx8fgiK6YVjFvLL5np1Ig+cx7xNGoyTb93zA1jg3ltCMXVFC jWp5duE0xl29tSkg1oe3mMLOq6xzShl0C1vgJsb9q48a2Z7lFUBYpCpKtqSG33YEWZcm2iwQ4 Co19zHJIEbZ2yNVCmFIy9cnOPvvXlfpT5SEnnySWE3Ca28Pod3IHOHJXpnFKu5j75sDaTSAFX 3no+BNjO/TCxfM+WQqphGSKKoYwCGmQw30txvnqhPOOay7VAvO/rqq5rw9czPFrQmRE+8Mp3e /Lz2VcWotPbPIeGfSnGpMdsHu6xQDXlH96tZDFVZyxFK0+9M0mN5pthC+uAYhU4uLh6Yt5rAA kgi0G80tPVVP4pGrw4rnhxOSy+DJ7fljI6sZXQe+SpfMZ5y2S3KwlOFxxBOpLN3ICSR9m0oQ4 sl5lD3GPRp8kJqt84H02yjmOvePQE4v0WwBObWq5twbl7R1iA9cTryp5iMWOS5GTZZMuWsvwC 2LIUuGnNIOb1Lt1yAupHEu5diyH0IExQ5fCrtmv5v9l8aBTZbbH+RmSfVD9V9cLK6gPGrj4gF vaC4W+Uf3gvk2XLGWfvqOVOHmgUAeHgX0LM3/ecRuHpHzt7rrBzFSyQ256c3qyoW0dQ04Ysfy JY/9I7L9YHLfavUc2IizaApZ+t/wSM/phbJnTuRWAyHP5RjQqMIW9tlf6CEFgF59tIQJbnLvw /GN6USwhmpn/zq6FNKHtoWcKhj2XzE7QpbId+B1LtAL/8oH56YwI/q9p71hTh+JhlrHkibB27 aS9tLybO/07X0UssiYMEWWJqQxKUT/21OiWU5LlHCcPPtJDI+3p7spk1WjNwxxbHa5VdAxv Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Laurent Vivier , Ilya Leoshkevich Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Ilya Leoshkevich Core dumps from emulating x86_64 on big-endian hosts contain incorrect register values. Signed-off-by: Ilya Leoshkevich Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210803172013.148446-1-iii@linux.ibm.com> Signed-off-by: Laurent Vivier --- linux-user/elfload.c | 88 ++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 42ef2a114855..01e9a833fbb6 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -172,33 +172,33 @@ typedef target_elf_greg_t target_elf_gregset_t[ELF_NREG]; */ static void elf_core_copy_regs(target_elf_gregset_t *regs, const CPUX86State *env) { - (*regs)[0] = env->regs[15]; - (*regs)[1] = env->regs[14]; - (*regs)[2] = env->regs[13]; - (*regs)[3] = env->regs[12]; - (*regs)[4] = env->regs[R_EBP]; - (*regs)[5] = env->regs[R_EBX]; - (*regs)[6] = env->regs[11]; - (*regs)[7] = env->regs[10]; - (*regs)[8] = env->regs[9]; - (*regs)[9] = env->regs[8]; - (*regs)[10] = env->regs[R_EAX]; - (*regs)[11] = env->regs[R_ECX]; - (*regs)[12] = env->regs[R_EDX]; - (*regs)[13] = env->regs[R_ESI]; - (*regs)[14] = env->regs[R_EDI]; - (*regs)[15] = env->regs[R_EAX]; /* XXX */ - (*regs)[16] = env->eip; - (*regs)[17] = env->segs[R_CS].selector & 0xffff; - (*regs)[18] = env->eflags; - (*regs)[19] = env->regs[R_ESP]; - (*regs)[20] = env->segs[R_SS].selector & 0xffff; - (*regs)[21] = env->segs[R_FS].selector & 0xffff; - (*regs)[22] = env->segs[R_GS].selector & 0xffff; - (*regs)[23] = env->segs[R_DS].selector & 0xffff; - (*regs)[24] = env->segs[R_ES].selector & 0xffff; - (*regs)[25] = env->segs[R_FS].selector & 0xffff; - (*regs)[26] = env->segs[R_GS].selector & 0xffff; + (*regs)[0] = tswapreg(env->regs[15]); + (*regs)[1] = tswapreg(env->regs[14]); + (*regs)[2] = tswapreg(env->regs[13]); + (*regs)[3] = tswapreg(env->regs[12]); + (*regs)[4] = tswapreg(env->regs[R_EBP]); + (*regs)[5] = tswapreg(env->regs[R_EBX]); + (*regs)[6] = tswapreg(env->regs[11]); + (*regs)[7] = tswapreg(env->regs[10]); + (*regs)[8] = tswapreg(env->regs[9]); + (*regs)[9] = tswapreg(env->regs[8]); + (*regs)[10] = tswapreg(env->regs[R_EAX]); + (*regs)[11] = tswapreg(env->regs[R_ECX]); + (*regs)[12] = tswapreg(env->regs[R_EDX]); + (*regs)[13] = tswapreg(env->regs[R_ESI]); + (*regs)[14] = tswapreg(env->regs[R_EDI]); + (*regs)[15] = tswapreg(env->regs[R_EAX]); /* XXX */ + (*regs)[16] = tswapreg(env->eip); + (*regs)[17] = tswapreg(env->segs[R_CS].selector & 0xffff); + (*regs)[18] = tswapreg(env->eflags); + (*regs)[19] = tswapreg(env->regs[R_ESP]); + (*regs)[20] = tswapreg(env->segs[R_SS].selector & 0xffff); + (*regs)[21] = tswapreg(env->segs[R_FS].selector & 0xffff); + (*regs)[22] = tswapreg(env->segs[R_GS].selector & 0xffff); + (*regs)[23] = tswapreg(env->segs[R_DS].selector & 0xffff); + (*regs)[24] = tswapreg(env->segs[R_ES].selector & 0xffff); + (*regs)[25] = tswapreg(env->segs[R_FS].selector & 0xffff); + (*regs)[26] = tswapreg(env->segs[R_GS].selector & 0xffff); } #else @@ -244,23 +244,23 @@ typedef target_elf_greg_t target_elf_gregset_t[ELF_NREG]; */ static void elf_core_copy_regs(target_elf_gregset_t *regs, const CPUX86State *env) { - (*regs)[0] = env->regs[R_EBX]; - (*regs)[1] = env->regs[R_ECX]; - (*regs)[2] = env->regs[R_EDX]; - (*regs)[3] = env->regs[R_ESI]; - (*regs)[4] = env->regs[R_EDI]; - (*regs)[5] = env->regs[R_EBP]; - (*regs)[6] = env->regs[R_EAX]; - (*regs)[7] = env->segs[R_DS].selector & 0xffff; - (*regs)[8] = env->segs[R_ES].selector & 0xffff; - (*regs)[9] = env->segs[R_FS].selector & 0xffff; - (*regs)[10] = env->segs[R_GS].selector & 0xffff; - (*regs)[11] = env->regs[R_EAX]; /* XXX */ - (*regs)[12] = env->eip; - (*regs)[13] = env->segs[R_CS].selector & 0xffff; - (*regs)[14] = env->eflags; - (*regs)[15] = env->regs[R_ESP]; - (*regs)[16] = env->segs[R_SS].selector & 0xffff; + (*regs)[0] = tswapreg(env->regs[R_EBX]); + (*regs)[1] = tswapreg(env->regs[R_ECX]); + (*regs)[2] = tswapreg(env->regs[R_EDX]); + (*regs)[3] = tswapreg(env->regs[R_ESI]); + (*regs)[4] = tswapreg(env->regs[R_EDI]); + (*regs)[5] = tswapreg(env->regs[R_EBP]); + (*regs)[6] = tswapreg(env->regs[R_EAX]); + (*regs)[7] = tswapreg(env->segs[R_DS].selector & 0xffff); + (*regs)[8] = tswapreg(env->segs[R_ES].selector & 0xffff); + (*regs)[9] = tswapreg(env->segs[R_FS].selector & 0xffff); + (*regs)[10] = tswapreg(env->segs[R_GS].selector & 0xffff); + (*regs)[11] = tswapreg(env->regs[R_EAX]); /* XXX */ + (*regs)[12] = tswapreg(env->eip); + (*regs)[13] = tswapreg(env->segs[R_CS].selector & 0xffff); + (*regs)[14] = tswapreg(env->eflags); + (*regs)[15] = tswapreg(env->regs[R_ESP]); + (*regs)[16] = tswapreg(env->segs[R_SS].selector & 0xffff); } #endif