[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/7] hmp: fix "dump-quest-memory" segfault (arm)
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 2/7] hmp: fix "dump-quest-memory" segfault (arm) |
Date: |
Thu, 14 Sep 2017 16:04:42 +0100 |
From: Laurent Vivier <address@hidden>
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 <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Greg Kurz <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Auger <address@hidden>
Tested-by: Eric Auger <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
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
- [Qemu-devel] [PULL 0/7] hmp queue, Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 2/7] hmp: fix "dump-quest-memory" segfault (arm),
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 1/7] hmp: fix "dump-quest-memory" segfault (ppc), Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 3/7] dump: do not dump non-existent guest memory, Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 4/7] tests/hmp: test "none" machine with memory, Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 5/7] hmp: extend "info numa" with hotplugged memory information, Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 7/7] hmp: introduce 'info memory_size_summary' command, Dr. David Alan Gilbert (git), 2017/09/14
- [Qemu-devel] [PULL 6/7] qmp: introduce query-memory-size-summary command, Dr. David Alan Gilbert (git), 2017/09/14
- Re: [Qemu-devel] [PULL 0/7] hmp queue, Peter Maydell, 2017/09/14