]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu_migration: Avoid writing to freed memory
authorJiri Denemark <jdenemar@redhat.com>
Thu, 2 Aug 2018 14:56:02 +0000 (16:56 +0200)
committerJiri Denemark <jdenemar@redhat.com>
Mon, 13 Aug 2018 09:29:09 +0000 (11:29 +0200)
When a domain is killed on the source host while it is being migrated
and libvirtd is waiting for the migration to finish (waiting for the
domain condition in qemuMigrationSrcWaitForCompletion), the run-time
state including priv->job.current may already be freed once
virDomainObjWait returns with -1. Thus the priv->job.current pointer
cached in jobInfo is no longer valid and setting jobInfo->status may
crash the daemon.

https://bugzilla.redhat.com/show_bug.cgi?id=1593137

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/qemu/qemu_migration.c

index 435cd174af6303286ccb075d0b326533825d266c..825a9d399b79291c4616e4c753765b27a7543417 100644 (file)
@@ -1584,7 +1584,8 @@ qemuMigrationSrcWaitForCompletion(virQEMUDriverPtr driver,
 
         if (events) {
             if (virDomainObjWait(vm) < 0) {
-                jobInfo->status = QEMU_DOMAIN_JOB_STATUS_FAILED;
+                if (virDomainObjIsActive(vm))
+                    jobInfo->status = QEMU_DOMAIN_JOB_STATUS_FAILED;
                 return -2;
             }
         } else {