add ARM to NUMA platform exlcludes

Fix for CVE-2011-2178, regression introduced in disk probe logic,
Bug 709775

.gitignore

@@ -2,4 +2,4 @@
 *.rpm
 i686
 x86_64
-libvirt-*.tar.xz
+libvirt-*.tar.gz

0001-Fix-padding-of-encrypted-data.patch

@@ -1,55 +0,0 @@
-From: "Daniel P. Berrange" <berrange@redhat.com>
-Date: Tue, 2 May 2017 11:32:43 +0100
-Subject: [PATCH] Fix padding of encrypted data
-
-If we are encoding a block of data that is 16 bytes in length,
-we cannot leave it as 16 bytes, we must pad it out to the next
-block boundary, 32 bytes. Without this padding, the decoder will
-incorrectly treat the last byte of plain text as the padding
-length, as it can't distinguish padded from non-padded data.
-
-The problem exhibited itself when using a 16 byte passphrase
-for a LUKS volume
-
-  $ virsh secret-set-value 55806c7d-8e93-456f-829b-607d8c198367 \
-       $(echo -n 1234567812345678 | base64)
-  Secret value set
-
-  $ virsh start demo
-  error: Failed to start domain demo
-  error: internal error: process exited while connecting to monitor: >>>>>>>>>>Len 16
-  2017-05-02T10:35:40.016390Z qemu-system-x86_64: -object \
-    secret,id=virtio-disk1-luks-secret0,data=SEtNi5vDUeyseMKHwc1c1Q==,\
-    keyid=masterKey0,iv=zm7apUB1A6dPcH53VW960Q==,format=base64: \
-    Incorrect number of padding bytes (56) found on decrypted data
-
-Notice how the padding '56' corresponds to the ordinal value of
-the character '8'.
-
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
-(cherry picked from commit 71890992daf37ec78b00b4ce873369421dc99731)
----
- src/util/vircrypto.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/util/vircrypto.c b/src/util/vircrypto.c
-index 03410a1a4..8f1e0b7b7 100644
---- a/src/util/vircrypto.c
-+++ b/src/util/vircrypto.c
-@@ -152,8 +152,14 @@ virCryptoEncryptDataAESgnutls(gnutls_cipher_algorithm_t gnutls_enc_alg,
-     uint8_t *ciphertext;
-     size_t ciphertextlen;
- 
--    /* Allocate a padded buffer, copy in the data */
--    ciphertextlen = VIR_ROUND_UP(datalen, 16);
-+    /* Allocate a padded buffer, copy in the data.
-+     *
-+     * NB, we must *always* have at least 1 byte of
-+     * padding - we can't skip it on multiples of
-+     * 16, otherwise decoder can't distinguish padded
-+     * data from non-padded data. Hence datalen + 1
-+     */
-+    ciphertextlen = VIR_ROUND_UP(datalen + 1, 16);
-     if (VIR_ALLOC_N(ciphertext, ciphertextlen) < 0)
-         return -1;
-     memcpy(ciphertext, data, datalen);

0002-spec-Add-support-for-building-the-zfs-storage-driver.patch

@@ -1,90 +0,0 @@
-From: Neal Gompa <ngompa13@gmail.com>
-Date: Mon, 17 Jul 2017 11:32:46 -0400
-Subject: [PATCH] spec: Add support for building the zfs storage driver
-
-Where it can be supported in Fedora, the driver is built and made
-available as a subpackage.
-
-Signed-off-by: Neal Gompa <ngompa13@gmail.com>
-(cherry picked from commit 9af764e86aef7dfb0191a9561bf1d1abf941da05)
----
- libvirt.spec.in | 31 +++++++++++++++++++++++++++++++
- 1 file changed, 31 insertions(+)
-
-diff --git a/libvirt.spec.in b/libvirt.spec.in
-index 8eb67fa2e..f9a705e7c 100644
---- a/libvirt.spec.in
-+++ b/libvirt.spec.in
-@@ -70,6 +70,13 @@
- %define with_storage_gluster 0%{!?_without_storage_gluster:1}
- %define with_numactl          0%{!?_without_numactl:1}
- 
-+# F25+ has zfs-fuse
-+%if 0%{?fedora} >= 25
-+    %define with_storage_zfs      0%{!?_without_storage_zfs:1}
-+%else
-+    %define with_storage_zfs      0
-+%endif
-+
- # A few optional bits off by default, we enable later
- %define with_fuse          0%{!?_without_fuse:0}
- %define with_cgconfig      0%{!?_without_cgconfig:0}
-@@ -113,6 +120,12 @@
-     %endif
- %endif
- 
-+# zfs-fuse is not available on some architectures
-+%ifarch s390 s390x aarch64
-+    %define with_storage_zfs 0
-+%endif
-+
-+
- # RHEL doesn't ship OpenVZ, VBox, UML, PowerHypervisor,
- # VMware, libxenserver (xenapi), libxenlight (Xen 4.1 and newer),
- # or HyperV.
-@@ -364,6 +377,12 @@ BuildRequires: glusterfs-devel >= 3.4.1
- %if %{with_storage_sheepdog}
- BuildRequires: sheepdog
- %endif
-+%if %{with_storage_zfs}
-+# Support any conforming implementation of zfs. On stock Fedora
-+# this is zfs-fuse, but could be zfsonlinux upstream RPMs
-+BuildRequires: /sbin/zfs
-+BuildRequires: /sbin/zpool
-+%endif
- %if %{with_numactl}
- # For QEMU/LXC numa info
- BuildRequires: numactl-devel
-@@ -597,6 +616,11 @@ Requires: device-mapper
- # For Sheepdog support
- Requires: sheepdog
- %endif
-+%if %{with_storage_zfs}
-+# Support any conforming implementation of zfs
-+Requires: /sbin/zfs
-+Requires: /sbin/zpool
-+%endif
- %if %{with_qemu}
- # From QEMU RPMs
- Requires: /usr/bin/qemu-img
-@@ -1063,6 +1087,12 @@ rm -rf .git
-     %define arg_storage_gluster --without-storage-gluster
- %endif
- 
-+%if %{with_storage_zfs}
-+    %define arg_storage_zfs --with-storage-zfs
-+%else
-+    %define arg_storage_zfs --without-storage-zfs
-+%endif
-+
- %if %{with_numactl}
-     %define arg_numactl --with-numactl
- %else
-@@ -1170,6 +1200,7 @@ rm -f po/stamp-po
-            %{?arg_storage_rbd} \
-            %{?arg_storage_sheepdog} \
-            %{?arg_storage_gluster} \
-+           %{?arg_storage_zfs} \
-            %{?arg_numactl} \
-            %{?arg_numad} \
-            --with-capng \

0003-Avoid-hidden-cgroup-mount-points.patch

@@ -1,150 +0,0 @@
-From: Juan Hernandez <jhernand@redhat.com>
-Date: Thu, 6 Jul 2017 17:03:31 +0200
-Subject: [PATCH] Avoid hidden cgroup mount points
-
-Currently the scan of the /proc/mounts file used to find cgroup mount
-points doesn't take into account that mount points may hidden by other
-mount points. For, example in certain Kubernetes environments the
-/proc/mounts contains the following lines:
-
-  cgroup /sys/fs/cgroup/net_prio,net_cls cgroup ...
-  tmpfs /sys/fs/cgroup tmpfs ...
-  cgroup /sys/fs/cgroup/net_cls,net_prio cgroup ...
-
-In this particular environment the first mount point is hidden by the
-second one. The correct mount point is the third one, but libvirt will
-never process it because it only checks the first mount point for each
-controller (net_cls in this case). So libvirt will try to use the first
-mount point, which doesn't actually exist, and the complete detection
-process will fail.
-
-To avoid that issue this patch changes the virCgroupDetectMountsFromFile
-function so that when there are duplicates it takes the information from
-the last line in /proc/mounts. This requires removing the previous
-explicit condition to skip duplicates, and adding code to free the
-memory used by the processing of duplicated lines.
-
-Related-To: https://bugzilla.redhat.com/1468214
-Related-To: https://github.com/kubevirt/libvirt/issues/4
-Signed-off-by: Juan Hernandez <jhernand@redhat.com>
-(cherry picked from commit dacd160d7479e0ec2d8a63f102145fd30636a1c8)
----
- src/util/vircgroup.c                | 23 ++++++++++++++---------
- tests/vircgroupdata/kubevirt.mounts | 25 +++++++++++++++++++++++++
- tests/vircgroupdata/kubevirt.parsed | 10 ++++++++++
- tests/vircgrouptest.c               |  1 +
- 4 files changed, 50 insertions(+), 9 deletions(-)
- create mode 100644 tests/vircgroupdata/kubevirt.mounts
- create mode 100644 tests/vircgroupdata/kubevirt.parsed
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index f2477d5e9..322f7fb54 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -396,6 +396,7 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
-             const char *typestr = virCgroupControllerTypeToString(i);
-             int typelen = strlen(typestr);
-             char *tmp = entry.mnt_opts;
-+            struct virCgroupController *controller = &group->controllers[i];
-             while (tmp) {
-                 char *next = strchr(tmp, ',');
-                 int len;
-@@ -405,18 +406,22 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
-                 } else {
-                     len = strlen(tmp);
-                 }
--                /* NB, the same controller can appear >1 time in mount list
--                 * due to bind mounts from one location to another. Pick the
--                 * first entry only
--                 */
--                if (typelen == len && STREQLEN(typestr, tmp, len) &&
--                    !group->controllers[i].mountPoint) {
-+
-+                if (typelen == len && STREQLEN(typestr, tmp, len)) {
-                     char *linksrc;
-                     struct stat sb;
-                     char *tmp2;
- 
--                    if (VIR_STRDUP(group->controllers[i].mountPoint,
--                                   entry.mnt_dir) < 0)
-+                    /* Note that the lines in /proc/mounts have the same
-+                     * order than the mount operations, and that there may
-+                     * be duplicates due to bind mounts. This means
-+                     * that the same mount point may be processed more than
-+                     * once. We need to save the results of the last one,
-+                     * and we need to be careful to release the memory used
-+                     * by previous processing. */
-+                    VIR_FREE(controller->mountPoint);
-+                    VIR_FREE(controller->linkPoint);
-+                    if (VIR_STRDUP(controller->mountPoint, entry.mnt_dir) < 0)
-                         goto error;
- 
-                     tmp2 = strrchr(entry.mnt_dir, '/');
-@@ -452,7 +457,7 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
-                                 VIR_WARN("Expecting a symlink at %s for controller %s",
-                                          linksrc, typestr);
-                             } else {
--                                group->controllers[i].linkPoint = linksrc;
-+                                controller->linkPoint = linksrc;
-                             }
-                         }
-                     }
-diff --git a/tests/vircgroupdata/kubevirt.mounts b/tests/vircgroupdata/kubevirt.mounts
-new file mode 100644
-index 000000000..ca036196b
---- /dev/null
-+++ b/tests/vircgroupdata/kubevirt.mounts
-@@ -0,0 +1,25 @@
-+rootfs / rootfs rw 0 0
-+proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0
-+udev /dev devtmpfs rw,nosuid,relatime,size=10240k,nr_inodes=1006404,mode=755 0 0
-+devpts /dev/pts devpts rw,relatime,gid=5,mode=620,ptmxmode=000 0 0
-+sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0
-+/dev/sda1 / ext4 rw,noatime,data=ordered 0 0
-+tmpfs /run tmpfs rw,nodev,relatime,size=812296k,mode=755 0 0
-+mqueue /dev/mqueue mqueue rw,nosuid,nodev,noexec,relatime 0 0
-+shm /dev/shm tmpfs rw,nosuid,nodev,noexec,relatime 0 0
-+debugfs /sys/kernel/debug debugfs rw,nosuid,nodev,noexec,relatime 0 0
-+cgroup_root /sys/fs/cgroup tmpfs rw,nosuid,nodev,noexec,relatime,size=10240k,mode=755 0 0
-+openrc /sys/fs/cgroup/openrc cgroup rw,nosuid,nodev,noexec,relatime,release_agent=/lib64/rc/sh/cgroup-release-agent.sh,name=openrc 0 0
-+cpuset /some/random/location/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0
-+cpuset /sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0
-+cpu /sys/fs/cgroup/cpu cgroup rw,nosuid,nodev,noexec,relatime,cpu 0 0
-+cpuacct /some/random/location/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuacct 0 0
-+cpuacct /sys/fs/cgroup/cpuacct cgroup rw,nosuid,nodev,noexec,relatime,cpuacct 0 0
-+memory /sys/fs/cgroup/memory cgroup rw,nosuid,nodev,noexec,relatime,memory 0 0
-+devices /sys/fs/cgroup/devices cgroup rw,nosuid,nodev,noexec,relatime,devices 0 0
-+freezer /sys/fs/cgroup/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0
-+blkio /sys/fs/cgroup/blkio cgroup rw,nosuid,nodev,noexec,relatime,blkio 0 0
-+perf_event /sys/fs/cgroup/perf_event cgroup rw,nosuid,nodev,noexec,relatime,perf_event 0 0
-+hugetlb /sys/fs/cgroup/hugetlb cgroup rw,nosuid,nodev,noexec,relatime,hugetlb 0 0
-+binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc rw,nosuid,nodev,noexec,relatime 0 0
-+freezer /some/random/location/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0
-diff --git a/tests/vircgroupdata/kubevirt.parsed b/tests/vircgroupdata/kubevirt.parsed
-new file mode 100644
-index 000000000..694870723
---- /dev/null
-+++ b/tests/vircgroupdata/kubevirt.parsed
-@@ -0,0 +1,10 @@
-+cpu          /sys/fs/cgroup/cpu
-+cpuacct      /sys/fs/cgroup/cpuacct
-+cpuset       /sys/fs/cgroup/cpuset
-+memory       /sys/fs/cgroup/memory
-+devices      /sys/fs/cgroup/devices
-+freezer      /some/random/location/freezer
-+blkio        /sys/fs/cgroup/blkio
-+net_cls      <null>
-+perf_event   /sys/fs/cgroup/perf_event
-+name=systemd <null>
-diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
-index f55ef74a1..cf0315f16 100644
---- a/tests/vircgrouptest.c
-+++ b/tests/vircgrouptest.c
-@@ -885,6 +885,7 @@ mymain(void)
-     DETECT_MOUNTS("cgroups3");
-     DETECT_MOUNTS("all-in-one");
-     DETECT_MOUNTS("no-cgroups");
-+    DETECT_MOUNTS("kubevirt");
- 
-     if (virTestRun("New cgroup for self", testCgroupNewForSelf, NULL) < 0)
-         ret = -1;

0004-docs-schema-make-disk-driver-name-attribute-optional.patch

@@ -1,53 +0,0 @@
-From: Jim Fehlig <jfehlig@suse.com>
-Date: Tue, 18 Jul 2017 10:20:35 -0600
-Subject: [PATCH] docs: schema: make disk driver name attribute optional
-
-/domain/devices/disk/driver/@name is not a required or mandatory
-attribute according to formatdomain, and indeed it was agreed on
-IRC that the attribute is "optional for input, recommended (but
-not required) for output". Currently the schema requires the
-attribute, causing virt-xml-validate to fail on disk config where
-the driver name is not explicitly specified. E.g.
-
-# cat test.xml | grep -A 5 cdrom
-    <disk type='file' device='cdrom'>
-      <driver type='raw'/>
-      <target dev='hdb' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='0' target='0' unit='1'/>
-    </disk>
-
-# virt-xml-validate test.xml
-Relax-NG validity error : Extra element devices in interleave
-test.xml:21: element devices: Relax-NG validity error : Element domain failed to validate content
-test.xml fails to validate
-
-Relaxing the name attribute to be optional fixes the validation
-
-# virt-xml-validate test.xml
-test.xml validates
-
-(cherry picked from commit b494e09d058f09b48d0fd8855edd557101294671)
----
- docs/schemas/domaincommon.rng | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
-index 9a7d03ed9..38dda780e 100644
---- a/docs/schemas/domaincommon.rng
-+++ b/docs/schemas/domaincommon.rng
-@@ -1670,9 +1670,11 @@
-     </element>
-   </define>
-   <define name="driverFormat">
--    <attribute name="name">
--      <ref name="genericName"/>
--    </attribute>
-+    <optional>
-+      <attribute name="name">
-+        <ref name="genericName"/>
-+      </attribute>
-+    </optional>
-     <optional>
-       <attribute name='type'>
-         <choice>

libvirt-0.8.3-avoid-resetting-errors.patch

@@ -0,0 +1,51 @@
+From 452bf160e5bbe0789d706fda95f5919551eb2cac Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Fri, 25 Mar 2011 16:45:45 +0100
+Subject: [PATCH 2/2] daemon: Avoid resetting errors before they are reported
+
+https://bugzilla.redhat.com/show_bug.cgi?id=690733
+
+Commit f44bfb7 was supposed to make sure no additional libvirt API (esp.
+*Free) is called before remoteDispatchConnError() is called on error.
+However, the patch missed two instances.
+(cherry picked from commit 55cc591fc18e87b29febf78dc5b424b7c12f7349)
+---
+ daemon/remote.c |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/daemon/remote.c b/daemon/remote.c
+index a8258ca..7464957 100644
+--- a/daemon/remote.c
++++ b/daemon/remote.c
+@@ -4547,12 +4547,13 @@ remoteDispatchStoragePoolListVolumes (struct qemud_server *server ATTRIBUTE_UNUS
+     ret->names.names_len =
+         virStoragePoolListVolumes (pool,
+                                    ret->names.names_val, args->maxnames);
+-    virStoragePoolFree(pool);
+     if (ret->names.names_len == -1) {
+         VIR_FREE(ret->names.names_val);
+         remoteDispatchConnError(rerr, conn);
++        virStoragePoolFree(pool);
+         return -1;
+     }
++    virStoragePoolFree(pool);
+ 
+     return 0;
+ }
+@@ -4576,11 +4577,12 @@ remoteDispatchStoragePoolNumOfVolumes (struct qemud_server *server ATTRIBUTE_UNU
+     }
+ 
+     ret->num = virStoragePoolNumOfVolumes (pool);
+-    virStoragePoolFree(pool);
+     if (ret->num == -1) {
+         remoteDispatchConnError(rerr, conn);
++        virStoragePoolFree(pool);
+         return -1;
+     }
++    virStoragePoolFree(pool);
+ 
+     return 0;
+ }
+-- 
+1.7.3.4
+

libvirt-0.8.3-boot-menu.patch

@@ -0,0 +1,12 @@
+diff -rup libvirt-0.8.3.orig/src/qemu/qemu_conf.c libvirt-0.8.3.new/src/qemu/qemu_conf.c
+--- libvirt-0.8.3.orig/src/qemu/qemu_conf.c	2010-08-04 13:21:27.000000000 +0100
++++ libvirt-0.8.3.new/src/qemu/qemu_conf.c	2010-08-23 21:08:13.239794362 +0100
+@@ -3651,7 +3651,7 @@ int qemudBuildCommandLine(virConnectPtr 
+ {
+     int i;
+     char memory[50];
+-    char boot[VIR_DOMAIN_BOOT_LAST];
++    char boot[VIR_DOMAIN_BOOT_LAST+1];
+     struct utsname ut;
+     int disableKQEMU = 0;
+     int disableKVM = 0;

libvirt-0.8.3-fix-var-lib-libvirt-permissions.patch

@@ -0,0 +1,44 @@
+From f970d802ab805f1a37af384f148f34e108714034 Mon Sep 17 00:00:00 2001
+From: Eric Blake <eblake@redhat.com>
+Date: Wed, 3 Nov 2010 15:20:24 -0600
+Subject: [PATCH] rpm: fix /var/lib/libvirt permissions
+
+https://bugzilla.redhat.com/show_bug.cgi?id=649511
+
+Regression of forcing 0700 permissions (which breaks guest startup
+because the qemu user can't see /var/lib/libvirt/*.monitor) was
+introduced in commit 66823690e, as part of libvirt 0.8.2.
+
+* libvirt.spec.in (%files): Drop %{_localstatedir}/lib/libvirt,
+since libvirt depends on libvirt-client.
+(%files client): Guarantee 755 permissions on
+%(_localstatedir}/lib/libvirt, since the qemu user must be able to
+do pathname resolution to a subdirectory.
+---
+ libvirt.spec.in |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/libvirt.spec.in b/libvirt.spec.in
+index 813e0c0..f77626e 100644
+--- a/libvirt.spec.in
++++ b/libvirt.spec.in
+@@ -793,7 +793,6 @@ fi
+ 
+ %dir %{_localstatedir}/run/libvirt/
+ 
+-%dir %{_localstatedir}/lib/libvirt/
+ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/
+ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/boot/
+ %dir %attr(0700, root, root) %{_localstatedir}/cache/libvirt/
+@@ -883,7 +882,7 @@ fi
+ 
+ %{_sysconfdir}/rc.d/init.d/libvirt-guests
+ %config(noreplace) %{_sysconfdir}/sysconfig/libvirt-guests
+-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt
++%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/
+ 
+ %if %{with_sasl}
+ %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
+-- 
+1.7.3.4
+

libvirt-0.8.3-octal-addresses.patch

@@ -0,0 +1,53 @@
+From 8efebd1761700a0cc32736829aead7807cc7865d Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Tue, 26 Oct 2010 14:45:03 +0200
+Subject: [PATCH] qemu: don't use %.3d format for bus/addr of USB devices
+
+When using 0-prefixed numbers, QEmu will interpret them as octal numbers
+(as C convention says); this means that if you attach a device that has
+addr > 10 (decimal) you're going to attach a different device.
+---
+ src/qemu/qemu_conf.c                               |    4 ++--
+ .../qemuxml2argv-hostdev-usb-address-device.args   |    2 +-
+ .../qemuxml2argv-hostdev-usb-address.args          |    2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
+index 00e89a1..5bd3d4c 100644
+--- a/src/qemu/qemu_conf.c
++++ b/src/qemu/qemu_conf.c
+@@ -3266,7 +3266,7 @@ qemuBuildUSBHostdevDevStr(virDomainHostdevDefPtr dev)
+         return NULL;
+     }
+ 
+-    if (virAsprintf(&ret, "usb-host,hostbus=%.3d,hostaddr=%.3d,id=%s",
++    if (virAsprintf(&ret, "usb-host,hostbus=%d,hostaddr=%d,id=%s",
+                     dev->source.subsys.u.usb.bus,
+                     dev->source.subsys.u.usb.device,
+                     dev->info.alias) < 0)
+@@ -3288,7 +3288,7 @@ qemuBuildUSBHostdevUsbDevStr(virDomainHostdevDefPtr dev)
+         return NULL;
+     }
+ 
+-    if (virAsprintf(&ret, "host:%.3d.%.3d",
++    if (virAsprintf(&ret, "host:%d.%d",
+                     dev->source.subsys.u.usb.bus,
+                     dev->source.subsys.u.usb.device) < 0)
+         virReportOOMError();
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args
+index 6900fd3..7e42542 100644
+--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args
++++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args
+@@ -1 +1 @@
+-LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -usb -device usb-host,hostbus=014,hostaddr=006,id=hostdev0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
++LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -usb -device usb-host,hostbus=14,hostaddr=6,id=hostdev0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args
+index e57bec1..96e004d 100644
+--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args
++++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args
+@@ -1 +1 @@
+-LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -usbdevice host:014.006
++LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -usbdevice host:14.6
+-- 
+1.7.3.4
+

libvirt-0.8.3-read-only-checks.patch

@@ -0,0 +1,95 @@
+From: Guido Günther <agx@sigxcpu.org>
+Date: Mon, 14 Mar 2011 02:56:28 +0000 (+0800)
+Subject: Add missing checks for read only connections
+X-Git-Url: http://libvirt.org/git/?p=libvirt.git;a=commitdiff_plain;h=71753cb7f7a16ff800381c0b5ee4e99eea92fed3;hp=13c00dde3171b3a38d23cceb3f9151cb6cac3dad
+
+Add missing checks for read only connections
+
+As pointed on CVE-2011-1146, some API forgot to check the read-only
+status of the connection for entry point which modify the state
+of the system or may lead to a remote execution using user data.
+The entry points concerned are:
+  - virConnectDomainXMLToNative
+  - virNodeDeviceDettach
+  - virNodeDeviceReAttach
+  - virNodeDeviceReset
+  - virDomainRevertToSnapshot
+  - virDomainSnapshotDelete
+
+* src/libvirt.c: fix the above set of entry points to error on read-only
+                 connections
+
+Rebased to 0.8.2, mostly changed the call of the error routines
+---
+
+--- src/libvirt.c.orig	2011-03-14 17:03:45.000000000 +0800
++++ src/libvirt.c	2011-03-14 17:10:41.000000000 +0800
+@@ -3190,6 +3190,10 @@ char *virConnectDomainXMLToNative(virCon
+         virDispatchError(NULL);
+         return (NULL);
+     }
++    if (conn->flags & VIR_CONNECT_RO) {
++        virLibConnError(NULL, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        goto error;
++    }
+ 
+     if (nativeFormat == NULL || domainXml == NULL) {
+         virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__);
+@@ -9432,6 +9436,11 @@ virNodeDeviceDettach(virNodeDevicePtr de
+         return (-1);
+     }
+ 
++    if (dev->conn->flags & VIR_CONNECT_RO) {
++        virLibConnError(dev->conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        goto error;
++    }
++
+     if (dev->conn->driver->nodeDeviceDettach) {
+         int ret;
+         ret = dev->conn->driver->nodeDeviceDettach (dev);
+@@ -9475,6 +9484,11 @@ virNodeDeviceReAttach(virNodeDevicePtr d
+         return (-1);
+     }
+ 
++    if (dev->conn->flags & VIR_CONNECT_RO) {
++        virLibConnError(dev->conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        goto error;
++    }
++
+     if (dev->conn->driver->nodeDeviceReAttach) {
+         int ret;
+         ret = dev->conn->driver->nodeDeviceReAttach (dev);
+@@ -9520,6 +9534,11 @@ virNodeDeviceReset(virNodeDevicePtr dev)
+         return (-1);
+     }
+ 
++    if (dev->conn->flags & VIR_CONNECT_RO) {
++        virLibConnError(dev->conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        goto error;
++    }
++
+     if (dev->conn->driver->nodeDeviceReset) {
+         int ret;
+         ret = dev->conn->driver->nodeDeviceReset (dev);
+@@ -12775,6 +12794,10 @@ virDomainRevertToSnapshot(virDomainSnaps
+     }
+ 
+     conn = snapshot->domain->conn;
++    if (conn->flags & VIR_CONNECT_RO) {
++        virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        goto error;
++    }
+ 
+     if (conn->driver->domainRevertToSnapshot) {
+         int ret = conn->driver->domainRevertToSnapshot(snapshot, flags);
+@@ -12821,6 +12844,10 @@ virDomainSnapshotDelete(virDomainSnapsho
+     }
+ 
+     conn = snapshot->domain->conn;
++    if (conn->flags & VIR_CONNECT_RO) {
++        virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        goto error;
++    }
+ 
+     if (conn->driver->domainSnapshotDelete) {
+         int ret = conn->driver->domainSnapshotDelete(snapshot, flags);

libvirt-0.8.3-remote-protect-against-integer-overflow.patch

@@ -0,0 +1,106 @@
+From 584f9cee6926b57a19cc8bb36ea77124bdcfed94 Mon Sep 17 00:00:00 2001
+From: Eric Blake <eblake@redhat.com>
+Date: Fri, 24 Jun 2011 12:16:05 -0600
+Subject: [PATCH] remote: protect against integer overflow
+
+https://bugzilla.redhat.com/show_bug.cgi?id=717204
+CVE-2011-2511 - integer overflow in VirDomainGetVcpus
+
+Integer overflow and remote code are never a nice mix.
+
+This has existed since commit 56cd414.
+
+* src/libvirt.c (virDomainGetVcpus): Reject overflow up front.
+* src/remote/remote_driver.c (remoteDomainGetVcpus): Avoid overflow
+  on sending rpc.
+* daemon/remote.c (remoteDispatchDomainGetVcpus): Avoid overflow on
+  receiving rpc.
+
+(cherry picked from commit 774b21c163845170c9ffa873f5720d318812eaf6)
+
+Conflicts:
+
+	daemon/remote.c
+	src/remote/remote_driver.c
+        src/libvirt.c
+
+Change to internal.h required to avoid backporting 89d994ad.
+---
+ daemon/remote.c            |    3 ++-
+ src/internal.h             |   17 +++++++++++++++++
+ src/libvirt.c              |    4 ++--
+ src/remote/remote_driver.c |    3 ++-
+ 4 files changed, 23 insertions(+), 4 deletions(-)
+
+diff --git a/daemon/remote.c b/daemon/remote.c
+index 7464957..c6f7007 100644
+--- a/daemon/remote.c
++++ b/daemon/remote.c
+@@ -1697,7 +1697,8 @@ remoteDispatchDomainGetVcpus (struct qemud_server *server ATTRIBUTE_UNUSED,
+         return -1;
+     }
+ 
+-    if (args->maxinfo * args->maplen > REMOTE_CPUMAPS_MAX) {
++    if (INT_MULTIPLY_OVERFLOW(args->maxinfo, args->maplen) ||
++        args->maxinfo * args->maplen > REMOTE_CPUMAPS_MAX) {
+         virDomainFree(dom);
+         remoteDispatchFormatError (rerr, "%s", _("maxinfo * maplen > REMOTE_CPUMAPS_MAX"));
+         return -1;
+diff --git a/src/internal.h b/src/internal.h
+index fab3e11..53447a9 100644
+--- a/src/internal.h
++++ b/src/internal.h
+@@ -226,4 +226,21 @@
+         }                                                               \
+     } while (0)
+ 
++/* branch-specific: we don't want to update gnulib on the branch, so this
++ * backports just one required macro from newer gnulib's intprops.h.
++ * This version requires that both a and b are 'int', rather than
++ * the fully type-generic version from gnulib.  */
++# define INT_MULTIPLY_OVERFLOW(a, b)            \
++    ((b) < 0                                    \
++     ? ((a) < 0                                 \
++        ? (a) < INT_MAX / (b)                   \
++        : (b) == -1                             \
++        ? 0                                     \
++        : INT_MIN / (b) < (a))                  \
++     : (b) == 0                                 \
++     ? 0                                        \
++     : ((a) < 0                                 \
++        ? (a) < INT_MIN / (b)                   \
++        : INT_MAX / (b) < (a)))
++
+ #endif                          /* __VIR_INTERNAL_H__ */
+diff --git a/src/libvirt.c b/src/libvirt.c
+index 1213ecf..6a584fb 100644
+--- a/src/libvirt.c
++++ b/src/libvirt.c
+@@ -5218,8 +5218,8 @@ virDomainGetVcpus(virDomainPtr domain, virVcpuInfoPtr info, int maxinfo,
+ 
+     /* Ensure that domainGetVcpus (aka remoteDomainGetVcpus) does not
+        try to memcpy anything into a NULL pointer.  */
+-    if ((cpumaps == NULL && maplen != 0)
+-        || (cpumaps && maplen <= 0)) {
++    if (!cpumaps ? maplen != 0
++        : (maplen <= 0 || INT_MULTIPLY_OVERFLOW(maxinfo, maplen))) {
+         virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__);
+         goto error;
+     }
+diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
+index cb0d8e1..0d9b425 100644
+--- a/src/remote/remote_driver.c
++++ b/src/remote/remote_driver.c
+@@ -2467,7 +2467,8 @@ remoteDomainGetVcpus (virDomainPtr domain,
+                     maxinfo, REMOTE_VCPUINFO_MAX);
+         goto done;
+     }
+-    if (maxinfo * maplen > REMOTE_CPUMAPS_MAX) {
++    if (INT_MULTIPLY_OVERFLOW(maxinfo, maplen) ||
++        maxinfo * maplen > REMOTE_CPUMAPS_MAX) {
+         remoteError(VIR_ERR_RPC,
+                     _("vCPU map buffer length exceeds maximum: %d > %d"),
+                     maxinfo * maplen, REMOTE_CPUMAPS_MAX);
+-- 
+1.7.3.4
+

sources

@@ -1 +1 @@
-SHA512 (libvirt-2.2.1.tar.xz) = b89a2665bea81c440afc3f9f69c26e314344f1f2fbf53f82b25bdddcc89532ddf3393902e9cf552edb827ce5d8b46b9214b5a25303b19cf0f3f085131d870518
+ae8535ce119d32a2e9fb1f46e2c8f325  libvirt-0.8.3.tar.gz