From c1fd7d7b3e7a1b80d641f6300be9d91e2d238a7b Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 13 Jul 2010 15:15:04 -0500 Subject: [PATCH] qemuConnectMonitor: fix a bug that would have masked SELinux failure * src/qemu/qemu_driver.c (qemuConnectMonitor): Correct erroneous parenthesization in two expressions. Without this fix, failure to set or clear SELinux security context in the monitor would go undiagnosed. Also correct a diagnostic and split some long lines. --- src/qemu/qemu_driver.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 487bfa3dd1..96277cd8f0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1194,10 +1194,12 @@ qemuConnectMonitor(struct qemud_driver *driver, virDomainObjPtr vm) qemuDomainObjPrivatePtr priv = vm->privateData; int ret = -1; - if ((driver->securityDriver && - driver->securityDriver->domainSetSecuritySocketLabel && - driver->securityDriver->domainSetSecuritySocketLabel(driver->securityDriver,vm)) < 0) { - VIR_ERROR(_("Failed to set security context for monitor for %s"), vm->def->name); + if (driver->securityDriver && + driver->securityDriver->domainSetSecuritySocketLabel && + driver->securityDriver->domainSetSecuritySocketLabel + (driver->securityDriver,vm) < 0) { + VIR_ERROR(_("Failed to set security context for monitor for %s"), + vm->def->name); goto error; } @@ -1213,10 +1215,12 @@ qemuConnectMonitor(struct qemud_driver *driver, virDomainObjPtr vm) if (priv->mon == NULL) virDomainObjUnref(vm); - if ((driver->securityDriver && - driver->securityDriver->domainClearSecuritySocketLabel && - driver->securityDriver->domainClearSecuritySocketLabel(driver->securityDriver,vm)) < 0) { - VIR_ERROR(_("Failed to set security context for monitor for %s"), vm->def->name); + if (driver->securityDriver && + driver->securityDriver->domainClearSecuritySocketLabel && + driver->securityDriver->domainClearSecuritySocketLabel + (driver->securityDriver,vm) < 0) { + VIR_ERROR(_("Failed to clear security context for monitor for %s"), + vm->def->name); goto error; }