diff options
| author | Peter Krempa <pkrempa@redhat.com> | 2014-09-11 16:35:53 +0200 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2014-09-17 21:05:15 -0600 |
| commit | ed071fee073bc5a439ec64f0e501d5f90c41dec5 (patch) | |
| tree | 1d1f4ede06815a1e283389cb300df8f6253ab894 | |
| parent | 9bb60cb44357d4b7698db5ca41a524c1411a4358 (diff) | |
| download | libvirt-ed071fee073bc5a439ec64f0e501d5f90c41dec5.tar.gz | |
CVE-2014-3633: qemu: blkiotune: Use correct definition when looking up disk
Live definition was used to look up the disk index while persistent one
was indexed leading to a crash in qemuDomainGetBlockIoTune. Use the
correct def and report a nice error.
Unfortunately it's accessible via read-only connection, though it can
only crash libvirtd in the cases where the guest is hot-plugging disks
without reflecting those changes to the persistent definition. So
avoiding hotplug, or doing hotplug where persistent is always modified
alongside live definition, will avoid the out-of-bounds access.
Introduced in: eca96694a7f992be633d48d5ca03cedc9bbc3c9aa (v0.9.8)
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1140724
Reported-by: Luyao Huang <lhuang@redhat.com>
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
(cherry picked from commit 3e745e8f775dfe6f64f18b5c2fe4791b35d3546b)
| -rw-r--r-- | src/qemu/qemu_driver.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 585bc2755d..8c7ca6ce44 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15106,9 +15106,13 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, } if (flags & VIR_DOMAIN_AFFECT_CONFIG) { - int idx = virDomainDiskIndexByName(vm->def, disk, true); - if (idx < 0) + int idx = virDomainDiskIndexByName(persistentDef, disk, true); + if (idx < 0) { + virReportError(VIR_ERR_INVALID_ARG, + _("disk '%s' was not found in the domain config"), + disk); goto endjob; + } reply = persistentDef->disks[idx]->blkdeviotune; } |