[v2] hmp: fix "info cpu" segfault

[Qemu-devel] [PATCH v2] hmp: fix "info cpu" segfault

Iwona Kotlarska posted 1 patch 7 years ago

Diff against v1 v2 v3
Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20170329183914.4197-1-iwona260909@gmail.com

Test s390x passed

There is a newer version of this series

target/i386/arch_dump.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)

Expand all Fold all

[Qemu-devel] [PATCH v2] hmp: fix "info cpu" segfault

Posted by Iwona Kotlarska 7 years ago

Running QEMU with "qemu-system-x86_64 -M none -nographic -m 256" and executing
"dump-guest-memory /dev/null 0 8192" results in segfault.
Fix by checking if we have CPU.

Signed-off-by: Iwona Kotlarska <iwona260909@gmail.com>
---
 target/i386/arch_dump.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/target/i386/arch_dump.c b/target/i386/arch_dump.c
index 5a2e4be5d0..43992a440c 100644
--- a/target/i386/arch_dump.c
+++ b/target/i386/arch_dump.c
@@ -390,9 +390,11 @@ int cpu_get_dump_info(ArchDumpInfo *info,
     GuestPhysBlock *block;
 
 #ifdef TARGET_X86_64
-    X86CPU *first_x86_cpu = X86_CPU(first_cpu);
-
-    lma = !!(first_x86_cpu->env.hflags & HF_LMA_MASK);
+    X86CPU *first_x86_cpu = NULL;
+    first_x86_cpu = X86_CPU(first_cpu);
+    if (first_cpu != NULL) {
+        lma = !!(first_x86_cpu->env.hflags & HF_LMA_MASK);
+    }
 #endif
 
     if (lma) {
-- 
2.12.0