From: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
Date: Thu, 6 Nov 2014 14:04:04 +0000 (+0100)
Subject: qemu: Correct disk type checking logic for iothreads
X-Git-Tag: CVE-2014-8135~226
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8402be5c1059e0d0c5921cf319f940db0e425e57;p=thirdparty%2Flibvirt.git

qemu: Correct disk type checking logic for iothreads

Finding the right type of disk should check for virtio as bus and
pci as device address type.

Signed-off-by: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
Reviewed-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 3bed0ec3cc..058c2212cf 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3737,7 +3737,7 @@ qemuCheckIothreads(virDomainDefPtr def,
     }
 
     /* Right "type" of disk" */
-    if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO &&
+    if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO ||
         disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("IOThreads only available for virtio pci disk"));