From 6d490ed0d853babaa925414536d805c665076097 Mon Sep 17 00:00:00 2001 From: Erik Skultety Date: Mon, 18 Jun 2018 09:20:13 +0200 Subject: [PATCH] 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 Reported-by: Luyao Huang Reviewed-by: Marc Hartmayer --- src/qemu/qemu_driver.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0c790c14bb..66125f25f6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -21520,12 +21520,13 @@ qemuDomainGetSEVMeasurement(virQEMUDriverPtr driver, 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) -- 2.47.2