qemu: Fix job usage in virDomainGetBlockIoTune

CVE-2013-6458

Every API that is going to begin a job should do that before fetching
data from vm->def.

Conflicts:
	src/qemu/qemu_driver.c

(cherry picked from commit 3b56425938e2f97208d5918263efa0d6439e4ecd)
This commit is contained in:
Jiri Denemark 2013-12-20 15:41:04 +01:00 committed by Guido Günther
parent 3e7d9e54e9
commit 2786686eb5

View File

@ -12157,12 +12157,6 @@ qemuDomainGetBlockIoTune(virDomainPtr dom,
goto cleanup;
}
device = qemuDiskPathToAlias(vm, disk, NULL);
if (!device) {
goto cleanup;
}
if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_MODIFY) < 0)
goto cleanup;
@ -12170,6 +12164,11 @@ qemuDomainGetBlockIoTune(virDomainPtr dom,
&persistentDef) < 0)
goto endjob;
device = qemuDiskPathToAlias(vm, disk, NULL);
if (!device) {
goto endjob;
}
if (flags & VIR_DOMAIN_AFFECT_LIVE) {
priv = vm->privateData;
qemuDomainObjEnterMonitorWithDriver(driver, vm);