]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
lock qemu_driver early in qemuGetSchedulerParametersFlags()
authorWen Congyang <wency@cn.fujitsu.com>
Tue, 28 Jun 2011 07:58:44 +0000 (15:58 +0800)
committerWen Congyang <wency@cn.fujitsu.com>
Thu, 30 Jun 2011 05:27:00 +0000 (13:27 +0800)
If we pass VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG to
qemuGetSchedulerParametersFlags() or *nparams is less than 1,
we will unlock qemu_driver without locking it. It's very dangerous.

We should lock qemu_driver after calling virCheckFlags().

src/qemu/qemu_driver.c

index 2f20c574b8f2a138984f365d5217f6b14b5b5d52..d63f57df3ad6b0b045d3e9ac33e95f180a666654 100644 (file)
@@ -5837,6 +5837,8 @@ qemuGetSchedulerParametersFlags(virDomainPtr dom,
     virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
                   VIR_DOMAIN_AFFECT_CONFIG, -1);
 
+    qemuDriverLock(driver);
+
     if ((flags & (VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG)) ==
         (VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG)) {
         qemuReportError(VIR_ERR_INVALID_ARG, "%s",
@@ -5850,7 +5852,6 @@ qemuGetSchedulerParametersFlags(virDomainPtr dom,
         goto cleanup;
     }
 
-    qemuDriverLock(driver);
     vm = virDomainFindByUUID(&driver->domains, dom->uuid);
 
     if (vm == NULL) {