[Pkg-libvirt-commits] [libvirt] 01/02: CVE-2014-3633: qemu: blkiotune: Use correct definition when looking up disk

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to annotated tag debian/1.2.8-2
in repository libvirt.

commit e1e734b2cac11de04b43e304eca1a72aa5d4f88b
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Sep 23 08:51:18 2014 +0200

    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.
    
    Thanks: Peter Krempa
    Closes: #762203
---
 ...33-qemu-blkiotune-Use-correct-definition-.patch | 43 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 44 insertions(+)

diff --git a/debian/patches/security/CVE-2014-3633-qemu-blkiotune-Use-correct-definition-.patch b/debian/patches/security/CVE-2014-3633-qemu-blkiotune-Use-correct-definition-.patch
new file mode 100644
index 0000000..5f74683
--- /dev/null
+++ b/debian/patches/security/CVE-2014-3633-qemu-blkiotune-Use-correct-definition-.patch
@@ -0,0 +1,43 @@
+From: Peter Krempa <pkrempa at redhat.com>
+Date: Thu, 11 Sep 2014 16:35:53 +0200
+Subject: 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 at redhat.com>
+Signed-off-by: Peter Krempa <pkrempa at redhat.com>
+---
+ src/qemu/qemu_driver.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 239a300..291f490 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -16141,9 +16141,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;
+     }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3941abc..b86bfeb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ Allow-xen-toolstack-to-find-it-s-binaries.patch
 Skip-vircgrouptest.patch
 debian/Use-sensible-editor-as-fallback.patch
 debian/Debianize-virtlockd.patch
+security/CVE-2014-3633-qemu-blkiotune-Use-correct-definition-.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git