From b21c8cad6d25e328bb93f1ec218546f09c2fbed4 Mon Sep 17 00:00:00 2001 Message-Id: From: Erik Skultety Date: Fri, 22 Nov 2019 11:19:25 +0100 Subject: [PATCH] qemu: Fix NULL ptr dereference caused by qemuDomainDefFormatBufInternal qemuDomainDefFormatBufInternal function wasn't testing whether the CPU was actually defined in the XML and saving such a domain resulted in the following backtrace: 0 in qemuDomainMakeCPUMigratable (cpu=0x0) 1 in qemuDomainDefFormatBufInternal() 2 in qemuDomainDefFormatXMLInternal() 3 in qemuDomainDefFormatLive() 4 in qemuDomainSaveInternal() 5 in qemuDomainSaveFlags() 6 in qemuDomainSave() 7 in virDomainSave() Signed-off-by: Erik Skultety Reviewed-by: Daniel Henrique Barboza (cherry picked from commit 2816fe2e846ab3bd2bfbef123c426a17f1e1df98) https://bugzilla.redhat.com/show_bug.cgi?id=1775133 https://bugzilla.redhat.com/show_bug.cgi?id=1775134 https://bugzilla.redhat.com/show_bug.cgi?id=1775137 Signed-off-by: Jiri Denemark Message-Id: <13caf98777b14c8bc341de37a85c4dc04a50d78e.1574417839.git.jdenemar@redhat.com> Reviewed-by: Michal Privoznik --- src/qemu/qemu_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f45d7d427e..6b867ad669 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7543,7 +7543,7 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver, goto cleanup; } - if (qemuDomainMakeCPUMigratable(def->cpu) < 0) + if (def->cpu && qemuDomainMakeCPUMigratable(def->cpu) < 0) goto cleanup; } -- 2.24.0