From 20b0fd6d21f49d99fafc2d5350dfa211a5511383 Mon Sep 17 00:00:00 2001 From: Stefan Berger Date: Fri, 26 Jul 2019 17:07:05 -0400 Subject: [PATCH] tpm: Set transationStarted to false if commit failed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Set the transactionStarted to false if the commit failed. If this is not done, then the failure path will report 'no transaction is set' and hide more useful error reports. Signed-off-by: Stefan Berger Reviewed-by: Daniel P. Berrangé Message-Id: <20190726210706.24440-2-stefanb@linux.ibm.com> --- src/qemu/qemu_security.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_security.c b/src/qemu/qemu_security.c index 87209d3781..3cd6d9bd3d 100644 --- a/src/qemu/qemu_security.c +++ b/src/qemu/qemu_security.c @@ -476,7 +476,7 @@ qemuSecurityStartTPMEmulator(virQEMUDriverPtr driver, if (virSecurityManagerTransactionCommit(driver->securityManager, -1, priv->rememberOwner) < 0) - goto cleanup; + goto cleanup_abort; transactionStarted = false; if (virSecurityManagerSetChildProcessLabel(driver->securityManager, @@ -512,6 +512,7 @@ qemuSecurityStartTPMEmulator(virQEMUDriverPtr driver, -1, priv->rememberOwner) < 0) VIR_WARN("Unable to run security manager transaction"); + cleanup_abort: virSecurityManagerTransactionAbort(driver->securityManager); return ret; } -- GitLab