qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org, lvivier@redhat.com, cohuck@redhat.com,
	vadim.galitsyn@profitbricks.com
Cc: imammedo@redhat.com, thuth@redhat.com, peterx@redhat.com, groug@kaod.org
Subject: [Qemu-devel] [PULL 2/7] hmp: fix "dump-quest-memory" segfault (arm)
Date: Thu, 14 Sep 2017 16:04:42 +0100	[thread overview]
Message-ID: <20170914150447.19352-3-dgilbert@redhat.com> (raw)
In-Reply-To: <20170914150447.19352-1-dgilbert@redhat.com>

From: Laurent Vivier <lvivier@redhat.com>

Running QEMU with
    qemu-system-aarch64 -M none -nographic -m 256
and executing
    dump-guest-memory /dev/null 0 8192
results in segfault

Fix by checking if we have CPU, and exit with
error if there is no CPU:

    (qemu) dump-guest-memory /dev/null
    this feature or command is not currently supported

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Message-Id: <20170913142036.2469-3-lvivier@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 target/arm/arch_dump.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/target/arm/arch_dump.c b/target/arm/arch_dump.c
index 1a9861f69b..9e5b2fb31c 100644
--- a/target/arm/arch_dump.c
+++ b/target/arm/arch_dump.c
@@ -273,11 +273,18 @@ int arm_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs,
 int cpu_get_dump_info(ArchDumpInfo *info,
                       const GuestPhysBlockList *guest_phys_blocks)
 {
-    ARMCPU *cpu = ARM_CPU(first_cpu);
-    CPUARMState *env = &cpu->env;
+    ARMCPU *cpu;
+    CPUARMState *env;
     GuestPhysBlock *block;
     hwaddr lowest_addr = ULLONG_MAX;
 
+    if (first_cpu == NULL) {
+        return -1;
+    }
+
+    cpu = ARM_CPU(first_cpu);
+    env = &cpu->env;
+
     /* Take a best guess at the phys_base. If we get it wrong then crash
      * will need '--machdep phys_offset=<phys-offset>' added to its command
      * line, which isn't any worse than assuming we can use zero, but being
-- 
2.13.5

  parent reply	other threads:[~2017-09-14 15:05 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-14 15:04 [Qemu-devel] [PULL 0/7] hmp queue Dr. David Alan Gilbert (git)
2017-09-14 15:04 ` [Qemu-devel] [PULL 1/7] hmp: fix "dump-quest-memory" segfault (ppc) Dr. David Alan Gilbert (git)
2017-09-14 15:04 ` Dr. David Alan Gilbert (git) [this message]
2017-09-14 15:04 ` [Qemu-devel] [PULL 3/7] dump: do not dump non-existent guest memory Dr. David Alan Gilbert (git)
2017-09-14 15:04 ` [Qemu-devel] [PULL 4/7] tests/hmp: test "none" machine with memory Dr. David Alan Gilbert (git)
2017-09-14 15:04 ` [Qemu-devel] [PULL 5/7] hmp: extend "info numa" with hotplugged memory information Dr. David Alan Gilbert (git)
2017-09-14 15:04 ` [Qemu-devel] [PULL 6/7] qmp: introduce query-memory-size-summary command Dr. David Alan Gilbert (git)
2017-09-14 15:04 ` [Qemu-devel] [PULL 7/7] hmp: introduce 'info memory_size_summary' command Dr. David Alan Gilbert (git)
2017-09-14 16:58 ` [Qemu-devel] [PULL 0/7] hmp queue Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170914150447.19352-3-dgilbert@redhat.com \
    --to=dgilbert@redhat.com \
    --cc=cohuck@redhat.com \
    --cc=groug@kaod.org \
    --cc=imammedo@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    --cc=vadim.galitsyn@profitbricks.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).