File 6d490ed0-fix-sev-endjob.patch of Package libvirt.11425
commit 6d490ed0d853babaa925414536d805c665076097
Author: Erik Skultety <eskultet@redhat.com>
Date: Mon Jun 18 09:20:13 2018 +0200
qemu: sev: Don't jump to endjob if SEV measurement retrieval fails
If measurement retrieval fails we'd forget to call ExitMonitor to unlock
the monitor.
Signed-off-by: Erik Skultety <eskultet@redhat.com>
Reported-by: Luyao Huang <lhuang@redhat.com>
Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Index: libvirt-4.0.0/src/qemu/qemu_driver.c
===================================================================
--- libvirt-4.0.0.orig/src/qemu/qemu_driver.c
+++ libvirt-4.0.0/src/qemu/qemu_driver.c
@@ -21218,12 +21218,13 @@ qemuDomainGetSEVMeasurement(virQEMUDrive
qemuDomainObjEnterMonitor(driver, vm);
tmp = qemuMonitorGetSEVMeasurement(QEMU_DOMAIN_PRIVATE(vm)->mon);
- if (tmp == NULL)
- goto endjob;
if (qemuDomainObjExitMonitor(driver, vm) < 0)
goto endjob;
+ if (!tmp)
+ goto endjob;
+
if (virTypedParamsAddString(params, nparams, &maxpar,
VIR_DOMAIN_LAUNCH_SECURITY_SEV_MEASUREMENT,
tmp) < 0)