{"id":812396,"url":"http://patchwork.ozlabs.org/api/patches/812396/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911142056.15643-3-lvivier@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170911142056.15643-3-lvivier@redhat.com>","list_archive_url":null,"date":"2017-09-11T14:20:55","name":"[v2,2/3] hmp: fix \"dump-quest-memory\" segfault (arm)","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"65dd2ca0713f82e40249fdfb23c55e97afa211cb","submitter":{"id":66421,"url":"http://patchwork.ozlabs.org/api/people/66421/?format=json","name":"Laurent Vivier","email":"lvivier@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911142056.15643-3-lvivier@redhat.com/mbox/","series":[{"id":2509,"url":"http://patchwork.ozlabs.org/api/series/2509/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2509","date":"2017-09-11T14:20:53","name":"hmp: fix \"dump-quest-memory\" segfault","version":2,"mbox":"http://patchwork.ozlabs.org/series/2509/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/812396/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812396/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=lvivier@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xrVVr5XhMz9s5L\n\tfor ;\n\tTue, 12 Sep 2017 00:22:12 +1000 (AEST)","from localhost ([::1]:58050 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drPbG-0007hm-SH\n\tfor incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 10:22:10 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:50859)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drPaR-0007cS-DG\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 10:21:23 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drPaL-0001ot-Mk\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 10:21:19 -0400","from mx1.redhat.com ([209.132.183.28]:51192)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1drPaG-0001lO-4z; Mon, 11 Sep 2017 10:21:08 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 25367113204;\n\tMon, 11 Sep 2017 14:21:07 +0000 (UTC)","from thinkpad.redhat.com (ovpn-116-239.ams2.redhat.com\n\t[10.36.116.239])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 651D2649CC;\n\tMon, 11 Sep 2017 14:21:04 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 25367113204","From":"Laurent Vivier ","To":"qemu-devel@nongnu.org","Date":"Mon, 11 Sep 2017 16:20:55 +0200","Message-Id":"<20170911142056.15643-3-lvivier@redhat.com>","In-Reply-To":"<20170911142056.15643-1-lvivier@redhat.com>","References":"<20170911142056.15643-1-lvivier@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.38]);\n\tMon, 11 Sep 2017 14:21:07 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v2 2/3] hmp: fix \"dump-quest-memory\" segfault\n\t(arm)","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Laurent Vivier ,\n\tPeter Maydell ,\n\tThomas Huth , Cornelia Huck ,\n\t\"Dr . David Alan Gilbert\" ,\n\tGreg Kurz , qemu-arm@nongnu.org,\n\tqemu-ppc@nongnu.org, David Gibson ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Commit fd5d23babf (hmp: fix \"dump-quest-memory\" segfault)\nfixes the problem for i386, do the same for arm.\n\nRunning QEMU with\n qemu-system-aarch64 -M none -nographic -m 256\nand executing\n dump-guest-memory /dev/null 0 8192\nresults in segfault\n\nFix by checking if we have CPU.\n\nSigned-off-by: Laurent Vivier \n---\n target/arm/arch_dump.c | 52 +++++++++++++++++++++++++++++++++-----------------\n 1 file changed, 34 insertions(+), 18 deletions(-)","diff":"diff --git a/target/arm/arch_dump.c b/target/arm/arch_dump.c\nindex 1a9861f69b..1f58cff256 100644\n--- a/target/arm/arch_dump.c\n+++ b/target/arm/arch_dump.c\n@@ -273,8 +273,6 @@ int arm_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs,\n int cpu_get_dump_info(ArchDumpInfo *info,\n const GuestPhysBlockList *guest_phys_blocks)\n {\n- ARMCPU *cpu = ARM_CPU(first_cpu);\n- CPUARMState *env = &cpu->env;\n GuestPhysBlock *block;\n hwaddr lowest_addr = ULLONG_MAX;\n \n@@ -290,13 +288,32 @@ int cpu_get_dump_info(ArchDumpInfo *info,\n }\n }\n \n- if (arm_feature(env, ARM_FEATURE_AARCH64)) {\n- info->d_machine = EM_AARCH64;\n- info->d_class = ELFCLASS64;\n- info->page_size = (1 << 16); /* aarch64 max pagesize */\n- if (lowest_addr != ULLONG_MAX) {\n- info->phys_base = lowest_addr;\n+ if (first_cpu) {\n+ ARMCPU *cpu = ARM_CPU(first_cpu);\n+ CPUARMState *env = &cpu->env;\n+ if (arm_feature(env, ARM_FEATURE_AARCH64)) {\n+ info->d_machine = EM_AARCH64;\n+ info->d_class = ELFCLASS64;\n+ info->page_size = (1 << 16); /* aarch64 max pagesize */\n+ if (lowest_addr != ULLONG_MAX) {\n+ info->phys_base = lowest_addr;\n+ }\n+ } else {\n+ info->d_machine = EM_ARM;\n+ info->d_class = ELFCLASS32;\n+ info->page_size = (1 << 12);\n+ if (lowest_addr < UINT_MAX) {\n+ info->phys_base = lowest_addr;\n+ }\n }\n+\n+ /* We assume the relevant endianness is that of EL1; this is right\n+ * for kernels, but might give the wrong answer if you're trying to\n+ * dump a hypervisor that happens to be running an opposite-endian\n+ * kernel.\n+ */\n+ info->d_endian = (env->cp15.sctlr_el[1] & SCTLR_EE) != 0\n+ ? ELFDATA2MSB : ELFDATA2LSB;\n } else {\n info->d_machine = EM_ARM;\n info->d_class = ELFCLASS32;\n@@ -304,25 +321,24 @@ int cpu_get_dump_info(ArchDumpInfo *info,\n if (lowest_addr < UINT_MAX) {\n info->phys_base = lowest_addr;\n }\n+ info->d_endian = ELFDATA2LSB;\n }\n \n- /* We assume the relevant endianness is that of EL1; this is right\n- * for kernels, but might give the wrong answer if you're trying to\n- * dump a hypervisor that happens to be running an opposite-endian\n- * kernel.\n- */\n- info->d_endian = (env->cp15.sctlr_el[1] & SCTLR_EE) != 0\n- ? ELFDATA2MSB : ELFDATA2LSB;\n-\n return 0;\n }\n \n ssize_t cpu_get_note_size(int class, int machine, int nr_cpus)\n {\n- ARMCPU *cpu = ARM_CPU(first_cpu);\n- CPUARMState *env = &cpu->env;\n+ ARMCPU *cpu;\n+ CPUARMState *env;\n size_t note_size;\n \n+ if (first_cpu == NULL) {\n+ return 0;\n+ }\n+\n+ cpu = ARM_CPU(first_cpu);\n+ env = &cpu->env;\n if (class == ELFCLASS64) {\n note_size = AARCH64_PRSTATUS_NOTE_SIZE;\n note_size += AARCH64_PRFPREG_NOTE_SIZE;\n","prefixes":["v2","2/3"]}