add ARM to NUMA platform exlcludes

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

.cvsignore

@@ -1,8 +0,0 @@
-.build*.log
-*.rpm
-i686
-x86_64
-libvirt-*.tar.gz
-libvirt-0.6.0.tar.gz
-libvirt-0.6.1.tar.gz
-libvirt-0.6.2.tar.gz

.gitignore

@@ -0,0 +1,5 @@
+.build*.log
+*.rpm
+i686
+x86_64
+libvirt-*.tar.gz

Makefile

@@ -4,7 +4,7 @@ NAME := libvirt
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

branch

@@ -1 +0,0 @@
-F-11

libvirt-0.6.2-enable-qemu-0-10-migration.patch

@@ -1,45 +0,0 @@
-From: "Daniel P. Berrange" <berrange@redhat.com>
-To: libvir-list@redhat.com
-Date: Thu, 30 Apr 2009 15:09:05 +0100
-Subject: [libvirt] PATCH: Enable migration with QEMU >= 0.10.0
-
-The KVM migration code was added to QEMU for the 0.10.0 release, so we 
-should enable this in libvirt now.
-
-Daniel
-
-diff -r be7993675e07 src/qemu_conf.c
---- a/src/qemu_conf.c	Thu Apr 30 14:49:27 2009 +0100
-+++ b/src/qemu_conf.c	Thu Apr 30 15:08:45 2009 +0100
-@@ -472,16 +472,13 @@ int qemudExtractVersionInfo(const char *
- 
-     /*
-      * Handling of -incoming arg with varying features
--     *  -incoming tcp    (kvm >= 79)
--     *  -incoming exec   (kvm >= 80)
-+     *  -incoming tcp    (kvm >= 79, qemu >= 0.10.0)
-+     *  -incoming exec   (kvm >= 80, qemu >= 0.10.0)
-      *  -incoming stdio  (all earlier kvm)
-      *
-      * NB, there was a pre-kvm-79 'tcp' support, but it
-      * was broken, because it blocked the monitor console
-      * while waiting for data, so pretend it doesn't exist
--     *
--     * XXX when next QEMU release after 0.9.1 arrives,
--     * we'll need to add MIGRATE_QEMU_TCP/EXEC here too
-      */
-     if (kvm_version >= 79) {
-         flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP;
-@@ -489,6 +486,9 @@ int qemudExtractVersionInfo(const char *
-             flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC;
-     } else if (kvm_version > 0) {
-         flags |= QEMUD_CMD_FLAG_MIGRATE_KVM_STDIO;
-+    } else if (version >= 10000) {
-+        flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP;
-+        flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC;
-     }
- 
-     if (retversion)
-
-
--- 

libvirt-0.6.2-event-handling-1.patch

@@ -1,144 +0,0 @@
-From e7be6cc841a5652b73ddd2ccd3769c7f8bbad13d Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Tue, 12 May 2009 16:41:49 +0000
-Subject: [PATCH 1/2] Fix interrupting of main event thread & protect against accidental uniniitalized variables
-
----
- qemud/event.c |   42 +++++++++++++++++++++++++++++++++++-------
- 1 files changed, 35 insertions(+), 7 deletions(-)
-
-diff --git a/qemud/event.c b/qemud/event.c
-index 65f548e..754f2b1 100644
---- a/qemud/event.c
-+++ b/qemud/event.c
-@@ -84,10 +84,10 @@ struct virEventLoop {
- static struct virEventLoop eventLoop;
- 
- /* Unique ID for the next FD watch to be registered */
--static int nextWatch = 0;
-+static int nextWatch = 1;
- 
- /* Unique ID for the next timer to be registered */
--static int nextTimer = 0;
-+static int nextTimer = 1;
- 
- static void virEventLock(void)
- {
-@@ -143,15 +143,22 @@ int virEventAddHandleImpl(int fd, int events,
- 
- void virEventUpdateHandleImpl(int watch, int events) {
-     int i;
-+    EVENT_DEBUG("Update handle w=%d e=%d", watch, events);
-+
-+    if (watch <= 0) {
-+        VIR_WARN("Ignoring invalid update watch %d", watch);
-+        return;
-+    }
-+
-     virEventLock();
-     for (i = 0 ; i < eventLoop.handlesCount ; i++) {
-         if (eventLoop.handles[i].watch == watch) {
-             eventLoop.handles[i].events =
-                     virEventHandleTypeToPollEvent(events);
-+            virEventInterruptLocked();
-             break;
-         }
-     }
--    virEventInterruptLocked();
-     virEventUnlock();
- }
- 
-@@ -164,6 +171,12 @@ void virEventUpdateHandleImpl(int watch, int events) {
- int virEventRemoveHandleImpl(int watch) {
-     int i;
-     EVENT_DEBUG("Remove handle %d", watch);
-+
-+    if (watch <= 0) {
-+        VIR_WARN("Ignoring invalid remove watch %d", watch);
-+        return -1;
-+    }
-+
-     virEventLock();
-     for (i = 0 ; i < eventLoop.handlesCount ; i++) {
-         if (eventLoop.handles[i].deleted)
-@@ -172,11 +185,11 @@ int virEventRemoveHandleImpl(int watch) {
-         if (eventLoop.handles[i].watch == watch) {
-             EVENT_DEBUG("mark delete %d %d", i, eventLoop.handles[i].fd);
-             eventLoop.handles[i].deleted = 1;
-+            virEventInterruptLocked();
-             virEventUnlock();
-             return 0;
-         }
-     }
--    virEventInterruptLocked();
-     virEventUnlock();
-     return -1;
- }
-@@ -232,6 +245,12 @@ void virEventUpdateTimeoutImpl(int timer, int frequency) {
-     struct timeval tv;
-     int i;
-     EVENT_DEBUG("Updating timer %d timeout with %d ms freq", timer, frequency);
-+
-+    if (timer <= 0) {
-+        VIR_WARN("Ignoring invalid update timer %d", timer);
-+        return;
-+    }
-+
-     if (gettimeofday(&tv, NULL) < 0) {
-         return;
-     }
-@@ -244,10 +263,10 @@ void virEventUpdateTimeoutImpl(int timer, int frequency) {
-                 frequency >= 0 ? frequency +
-                 (((unsigned long long)tv.tv_sec)*1000) +
-                 (((unsigned long long)tv.tv_usec)/1000) : 0;
-+            virEventInterruptLocked();
-             break;
-         }
-     }
--    virEventInterruptLocked();
-     virEventUnlock();
- }
- 
-@@ -260,6 +279,12 @@ void virEventUpdateTimeoutImpl(int timer, int frequency) {
- int virEventRemoveTimeoutImpl(int timer) {
-     int i;
-     EVENT_DEBUG("Remove timer %d", timer);
-+
-+    if (timer <= 0) {
-+        VIR_WARN("Ignoring invalid remove timer %d", timer);
-+        return -1;
-+    }
-+
-     virEventLock();
-     for (i = 0 ; i < eventLoop.timeoutsCount ; i++) {
-         if (eventLoop.timeouts[i].deleted)
-@@ -267,11 +292,11 @@ int virEventRemoveTimeoutImpl(int timer) {
- 
-         if (eventLoop.timeouts[i].timer == timer) {
-             eventLoop.timeouts[i].deleted = 1;
-+            virEventInterruptLocked();
-             virEventUnlock();
-             return 0;
-         }
-     }
--    virEventInterruptLocked();
-     virEventUnlock();
-     return -1;
- }
-@@ -617,9 +642,12 @@ static int virEventInterruptLocked(void)
-     char c = '\0';
- 
-     if (!eventLoop.running ||
--        pthread_self() == eventLoop.leader)
-+        pthread_self() == eventLoop.leader) {
-+        VIR_DEBUG("Skip interrupt, %d %d", eventLoop.running, (int)eventLoop.leader);
-         return 0;
-+    }
- 
-+    VIR_DEBUG0("Interrupting");
-     if (safewrite(eventLoop.wakeupfd[1], &c, sizeof(c)) != sizeof(c))
-         return -1;
-     return 0;
--- 
-1.6.0.6
-

libvirt-0.6.2-event-handling-2.patch

@@ -1,197 +0,0 @@
-From 6483ee77ed12f037d68a6adc690624fa1b508dc0 Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Tue, 12 May 2009 16:43:04 +0000
-Subject: [PATCH 2/2] Fix watch/timer event deletion
-
----
- qemud/event.c |  112 ++++++++++++++++++++++++++-------------------------------
- 1 files changed, 51 insertions(+), 61 deletions(-)
-
-diff --git a/qemud/event.c b/qemud/event.c
-index 754f2b1..a57d967 100644
---- a/qemud/event.c
-+++ b/qemud/event.c
-@@ -313,7 +313,7 @@ static int virEventCalculateTimeout(int *timeout) {
-     EVENT_DEBUG("Calculate expiry of %d timers", eventLoop.timeoutsCount);
-     /* Figure out if we need a timeout */
-     for (i = 0 ; i < eventLoop.timeoutsCount ; i++) {
--        if (eventLoop.timeouts[i].deleted || eventLoop.timeouts[i].frequency < 0)
-+        if (eventLoop.timeouts[i].frequency < 0)
-             continue;
- 
-         EVENT_DEBUG("Got a timeout scheduled for %llu", eventLoop.timeouts[i].expiresAt);
-@@ -350,32 +350,26 @@ static int virEventCalculateTimeout(int *timeout) {
-  * file handles. The caller must free the returned data struct
-  * returns: the pollfd array, or NULL on error
-  */
--static int virEventMakePollFDs(struct pollfd **retfds) {
-+static struct pollfd *virEventMakePollFDs(void) {
-     struct pollfd *fds;
--    int i, nfds = 0;
-+    int i;
- 
--    for (i = 0 ; i < eventLoop.handlesCount ; i++) {
--        if (eventLoop.handles[i].deleted)
--            continue;
--        nfds++;
--    }
--    *retfds = NULL;
-     /* Setup the poll file handle data structs */
--    if (VIR_ALLOC_N(fds, nfds) < 0)
--        return -1;
-+    if (VIR_ALLOC_N(fds, eventLoop.handlesCount) < 0)
-+        return NULL;
- 
--    for (i = 0, nfds = 0 ; i < eventLoop.handlesCount ; i++) {
--        if (eventLoop.handles[i].deleted)
--            continue;
--        fds[nfds].fd = eventLoop.handles[i].fd;
--        fds[nfds].events = eventLoop.handles[i].events;
--        fds[nfds].revents = 0;
-+    for (i = 0 ; i < eventLoop.handlesCount ; i++) {
-+        EVENT_DEBUG("Prepare n=%d w=%d, f=%d e=%d", i,
-+                    eventLoop.handles[i].watch,
-+                    eventLoop.handles[i].fd,
-+                    eventLoop.handles[i].events);
-+        fds[i].fd = eventLoop.handles[i].fd;
-+        fds[i].events = eventLoop.handles[i].events;
-+        fds[i].revents = 0;
-         //EVENT_DEBUG("Wait for %d %d", eventLoop.handles[i].fd, eventLoop.handles[i].events);
--        nfds++;
-     }
- 
--    *retfds = fds;
--    return nfds;
-+    return fds;
- }
- 
- 
-@@ -435,26 +429,30 @@ static int virEventDispatchTimeouts(void) {
-  * Returns 0 upon success, -1 if an error occurred
-  */
- static int virEventDispatchHandles(int nfds, struct pollfd *fds) {
--    int i, n;
-+    int i;
- 
--    for (i = 0, n = 0 ; i < eventLoop.handlesCount && n < nfds ; i++) {
-+    /* NB, use nfds not eventLoop.handlesCount, because new
-+     * fds might be added on end of list, and they're not
-+     * in the fds array we've got */
-+    for (i = 0 ; i < nfds ; i++) {
-         if (eventLoop.handles[i].deleted) {
--            EVENT_DEBUG("Skip deleted %d", eventLoop.handles[i].fd);
-+            EVENT_DEBUG("Skip deleted n=%d w=%d f=%d", i,
-+                        eventLoop.handles[i].watch, eventLoop.handles[i].fd);
-             continue;
-         }
- 
--        if (fds[n].revents) {
-+        if (fds[i].revents) {
-             virEventHandleCallback cb = eventLoop.handles[i].cb;
-             void *opaque = eventLoop.handles[i].opaque;
--            int hEvents = virPollEventToEventHandleType(fds[n].revents);
--            EVENT_DEBUG("Dispatch %d %d %p", fds[n].fd,
--                        fds[n].revents, eventLoop.handles[i].opaque);
-+            int hEvents = virPollEventToEventHandleType(fds[i].revents);
-+            EVENT_DEBUG("Dispatch n=%d f=%d w=%d e=%d %p", i,
-+                        fds[i].fd, eventLoop.handles[i].watch,
-+                        fds[i].revents, eventLoop.handles[i].opaque);
-             virEventUnlock();
-             (cb)(eventLoop.handles[i].watch,
--                 fds[n].fd, hEvents, opaque);
-+                 fds[i].fd, hEvents, opaque);
-             virEventLock();
-         }
--        n++;
-     }
- 
-     return 0;
-@@ -545,22 +543,21 @@ static int virEventCleanupHandles(void) {
-  * at least one file handle has an event, or a timer expires
-  */
- int virEventRunOnce(void) {
--    struct pollfd *fds;
-+    struct pollfd *fds = NULL;
-     int ret, timeout, nfds;
- 
-     virEventLock();
-     eventLoop.running = 1;
-     eventLoop.leader = pthread_self();
--    if ((nfds = virEventMakePollFDs(&fds)) < 0) {
--        virEventUnlock();
--        return -1;
--    }
- 
--    if (virEventCalculateTimeout(&timeout) < 0) {
--        VIR_FREE(fds);
--        virEventUnlock();
--        return -1;
--    }
-+    if (virEventCleanupTimeouts() < 0 ||
-+        virEventCleanupHandles() < 0)
-+        goto error;
-+
-+    if (!(fds = virEventMakePollFDs()) ||
-+        virEventCalculateTimeout(&timeout) < 0)
-+        goto error;
-+    nfds = eventLoop.handlesCount;
- 
-     virEventUnlock();
- 
-@@ -572,38 +569,31 @@ int virEventRunOnce(void) {
-         if (errno == EINTR) {
-             goto retry;
-         }
--        VIR_FREE(fds);
--        return -1;
-+        goto error_unlocked;
-     }
- 
-     virEventLock();
--    if (virEventDispatchTimeouts() < 0) {
--        VIR_FREE(fds);
--        virEventUnlock();
--        return -1;
--    }
-+    if (virEventDispatchTimeouts() < 0)
-+        goto error;
- 
-     if (ret > 0 &&
--        virEventDispatchHandles(nfds, fds) < 0) {
--        VIR_FREE(fds);
--        virEventUnlock();
--        return -1;
--    }
--    VIR_FREE(fds);
--
--    if (virEventCleanupTimeouts() < 0) {
--        virEventUnlock();
--        return -1;
--    }
-+        virEventDispatchHandles(nfds, fds) < 0)
-+        goto error;
- 
--    if (virEventCleanupHandles() < 0) {
--        virEventUnlock();
--        return -1;
--    }
-+    if (virEventCleanupTimeouts() < 0 ||
-+        virEventCleanupHandles() < 0)
-+        goto error;
- 
-     eventLoop.running = 0;
-     virEventUnlock();
-+    VIR_FREE(fds);
-     return 0;
-+
-+error:
-+    virEventUnlock();
-+error_unlocked:
-+    VIR_FREE(fds);
-+    return -1;
- }
- 
- static void virEventHandleWakeup(int watch ATTRIBUTE_UNUSED,
--- 
-1.6.0.6
-

libvirt-0.6.2-fix-nosource-label.patch

@@ -1,13 +0,0 @@
-diff -rup libvirt-0.6.2/src/security_selinux.c new/src/security_selinux.c
---- libvirt-0.6.2/src/security_selinux.c	2009-05-10 22:04:25.000000000 -0400
-+++ new/src/security_selinux.c	2009-05-10 22:06:09.000000000 -0400
-@@ -338,6 +338,9 @@ SELinuxSetSecurityImageLabel(virConnectP
- {
-     const virSecurityLabelDefPtr secdef = &vm->def->seclabel;
- 
-+    if (!disk->src)
-+        return 0;
-+
-     if (disk->shared) {
-         return SELinuxSetFilecon(conn, disk->src, default_image_context);
-     } else if (disk->readonly) {

libvirt-0.6.2-fix-qemu-argv-detection-with-kvm-85.patch

@@ -1,82 +0,0 @@
-From 2b3fcdc378e7bec5c1a78b81632756e92930fd24 Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Mon, 11 May 2009 15:14:24 +0000
-Subject: [PATCH 1/1] Fix QEMU ARGV detection with kvm >= 85
-
----
- src/qemu_conf.c   |   18 ++++++++++++++----
- src/qemu_driver.c |   12 ++----------
- 2 files changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/src/qemu_conf.c b/src/qemu_conf.c
-index 9cb71eb..a57d3ab 100644
---- a/src/qemu_conf.c
-+++ b/src/qemu_conf.c
-@@ -431,18 +431,28 @@ int qemudExtractVersionInfo(const char *qemu,
-         return -1;
- 
-     char *help = NULL;
--    enum { MAX_HELP_OUTPUT_SIZE = 8192 };
-+    enum { MAX_HELP_OUTPUT_SIZE = 1024*64 };
-     int len = virFileReadLimFD(newstdout, MAX_HELP_OUTPUT_SIZE, &help);
--    if (len < 0)
-+    if (len < 0) {
-+        virReportSystemError(NULL, errno, "%s",
-+                             _("Unable to read QEMU help output"));
-         goto cleanup2;
-+    }
- 
-     if (sscanf(help, "QEMU PC emulator version %u.%u.%u (kvm-%u)",
-                &major, &minor, &micro, &kvm_version) != 4)
-         kvm_version = 0;
- 
--    if (!kvm_version && sscanf(help, "QEMU PC emulator version %u.%u.%u",
--               &major, &minor, &micro) != 3)
-+    if (!kvm_version &&
-+        sscanf(help, "QEMU PC emulator version %u.%u.%u",
-+               &major, &minor, &micro) != 3) {
-+        char *eol = strchr(help, '\n');
-+        if (eol) *eol = '\0';
-+        qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
-+                         _("cannot parse QEMU version number in '%s'"),
-+                         help);
-         goto cleanup2;
-+    }
- 
-     version = (major * 1000 * 1000) + (minor * 1000) + micro;
- 
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 30642d5..bd60b29 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -1391,12 +1391,8 @@ static int qemudStartVMDaemon(virConnectPtr conn,
- 
-     if (qemudExtractVersionInfo(emulator,
-                                 NULL,
--                                &qemuCmdFlags) < 0) {
--        qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
--                         _("Cannot determine QEMU argv syntax %s"),
--                         emulator);
-+                                &qemuCmdFlags) < 0)
-         goto cleanup;
--    }
- 
-     if (qemuPrepareHostDevices(conn, vm->def) < 0)
-         goto cleanup;
-@@ -3715,12 +3711,8 @@ static int qemudDomainChangeEjectableMedia(virConnectPtr conn,
- 
-     if (qemudExtractVersionInfo(vm->def->emulator,
-                                 NULL,
--                                &qemuCmdFlags) < 0) {
--        qemudReportError(conn, dom, NULL, VIR_ERR_INTERNAL_ERROR,
--                         _("Cannot determine QEMU argv syntax %s"),
--                         vm->def->emulator);
-+                                &qemuCmdFlags) < 0)
-         return -1;
--    }
- 
-     if (qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE) {
-         if (!(devname = qemudDiskDeviceName(conn, newdisk)))
--- 
-1.6.0.6
-

libvirt-0.6.2-qemu-drive-format.patch

@@ -1,26 +0,0 @@
-From 0ae4c67ff5f1d24698c5cfc8a9719d333c892644 Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Thu, 16 Apr 2009 11:23:55 +0100
-Subject: [PATCH 1/3] qemu -drive takes format= not fmt=
-
-Seems like a simple typo - it has been "format=" since the flag
-was introduced, but we added it as "fmt=".
-
-Signed-off-by: Mark McLoughlin <markmc@redhat.com>
----
- src/qemu_conf.c                                    |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu_conf.c b/src/qemu_conf.c
-index f36c927..6f9e610 100644
---- a/src/qemu_conf.c
-+++ b/src/qemu_conf.c
-@@ -1135,7 +1135,7 @@ int qemudBuildCommandLine(virConnectPtr conn,
-                 disk->device == VIR_DOMAIN_DISK_DEVICE_DISK)
-                 virBufferAddLit(&opt, ",boot=on");
-             if (disk->driverType)
--                virBufferVSprintf(&opt, ",fmt=%s", disk->driverType);
-+                virBufferVSprintf(&opt, ",format=%s", disk->driverType);
- 
-             if (disk->cachemode) {
-                 const char *mode =

libvirt-0.6.2-shared-readonly-label.patch

@@ -1,76 +0,0 @@
-diff -rup libvirt-0.6.2/src/security_selinux.c libvirt-0.6.2.new/src/security_selinux.c
---- libvirt-0.6.2/src/security_selinux.c	2009-04-03 15:36:56.000000000 +0100
-+++ libvirt-0.6.2.new/src/security_selinux.c	2009-05-05 13:39:42.000000000 +0100
-@@ -24,11 +24,12 @@
- #include "virterror_internal.h"
- #include "util.h"
- #include "memory.h"
--
-+#include "logging.h"
- 
- #define VIR_FROM_THIS VIR_FROM_SECURITY
- 
- static char default_domain_context[1024];
-+static char default_content_context[1024];
- static char default_image_context[1024];
- #define SECURITY_SELINUX_VOID_DOI       "0"
- #define SECURITY_SELINUX_NAME "selinux"
-@@ -148,8 +149,13 @@ SELinuxInitialize(virConnectPtr conn)
-     close(fd);
- 
-     ptr = strchrnul(default_image_context, '\n');
--    *ptr = '\0';
--
-+    if (*ptr == '\n') {
-+        *ptr = '\0';
-+        strcpy(default_content_context, ptr+1);
-+        ptr = strchrnul(default_content_context, '\n');
-+        if (*ptr == '\n')
-+            *ptr = '\0';
-+    }
-     return 0;
- }
- 
-@@ -275,6 +281,8 @@ SELinuxSetFilecon(virConnectPtr conn, co
- {
-     char ebuf[1024];
- 
-+    VIR_INFO("Setting SELinux context on '%s' to '%s'", path, tcon);
-+
-     if(setfilecon(path, tcon) < 0) {
-         virSecurityReportError(conn, VIR_ERR_ERROR,
-                                _("%s: unable to set security context "
-@@ -299,6 +307,8 @@ SELinuxRestoreSecurityImageLabel(virConn
-     char *newpath = NULL;
-     const char *path = disk->src;
- 
-+    /* Don't restore labels on readoly/shared disks, because
-+     * other VMs may still be accessing these */
-     if (disk->readonly || disk->shared)
-         return 0;
- 
-@@ -328,8 +338,13 @@ SELinuxSetSecurityImageLabel(virConnectP
- {
-     const virSecurityLabelDefPtr secdef = &vm->def->seclabel;
- 
--    if (secdef->imagelabel)
-+    if (disk->shared) {
-+        return SELinuxSetFilecon(conn, disk->src, default_image_context);
-+    } else if (disk->readonly) {
-+        return SELinuxSetFilecon(conn, disk->src, default_content_context);
-+    } else if (secdef->imagelabel) {
-         return SELinuxSetFilecon(conn, disk->src, secdef->imagelabel);
-+    }
- 
-     return 0;
- }
-@@ -403,9 +418,6 @@ SELinuxSetSecurityLabel(virConnectPtr co
- 
-     if (secdef->imagelabel) {
-         for (i = 0 ; i < vm->def->ndisks ; i++) {
--            if (vm->def->disks[i]->readonly ||
--                vm->def->disks[i]->shared) continue;
--
-             if (SELinuxSetSecurityImageLabel(conn, vm, vm->def->disks[i]) < 0)
-                 return -1;
-         }

libvirt-0.6.2-svirt-sound.patch

@@ -1,33 +0,0 @@
---- src/qemu_conf.c.orig	2009-04-02 11:50:10.000000000 +0200
-+++ src/qemu_conf.c	2009-04-03 17:46:59.000000000 +0200
-@@ -779,6 +779,20 @@ int qemudBuildCommandLine(virConnectPtr 
-     char domid[50];
-     char *pidfile;
-     const char *cpu = NULL;
-+    int skipSound = 0;
-+
-+    if (driver->securityDriver &&
-+        driver->securityDriver->name &&
-+        STREQ(driver->securityDriver->name, "selinux") &&
-+        getuid() == 0) {
-+        static int soundWarned = 0; 
-+        skipSound = 1;
-+        if (vm->def->nsounds &&
-+            !soundWarned) {
-+            soundWarned = 1;
-+            VIR_WARN0("Sound cards for VMs are disabled while SELinux security model is active");
-+        }
-+    }
- 
-     uname_normalize(&ut);
- 
-@@ -1425,7 +1439,8 @@ int qemudBuildCommandLine(virConnectPtr 
-     }
- 
-     /* Add sound hardware */
--    if (vm->def->nsounds) {
-+    if (vm->def->nsounds &&
-+        !skipSound) {
-         int size = 100;
-         char *modstr;
-         if (VIR_ALLOC_N(modstr, size+1) < 0)

libvirt-0.6.2-xml-attribute-escaping.patch

@@ -1,47 +0,0 @@
-From 7f7a4403860f56d5a1ad65bfd16f5bf97a971d45 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Wed, 13 May 2009 16:19:59 +0000
-Subject: [PATCH 1/1] * src/buf.c: avoid an XML attribute escaping bug #499791
- daniel
-
----
- src/buf.c |   16 +++++++++++++++-
- 1 files changed, 15 insertions(+), 1 deletions(-)
-
-diff --git a/src/buf.c b/src/buf.c
-index cdcdac9..259175d 100644
---- a/src/buf.c
-+++ b/src/buf.c
-@@ -266,7 +266,7 @@ virBufferEscapeString(const virBufferPtr buf, const char *format, const char *st
-         return;
- 
-     len = strlen(str);
--    if (VIR_ALLOC_N(escaped, 5 * len + 1) < 0) {
-+    if (VIR_ALLOC_N(escaped, 6 * len + 1) < 0) {
-         virBufferNoMemory(buf);
-         return;
-     }
-@@ -290,6 +290,20 @@ virBufferEscapeString(const virBufferPtr buf, const char *format, const char *st
-             *out++ = 'm';
-             *out++ = 'p';
-             *out++ = ';';
-+        } else if (*cur == '"') {
-+            *out++ = '&';
-+            *out++ = 'q';
-+            *out++ = 'u';
-+            *out++ = 'o';
-+            *out++ = 't';
-+            *out++ = ';';
-+        } else if (*cur == '\'') {
-+            *out++ = '&';
-+            *out++ = 'a';
-+            *out++ = 'p';
-+            *out++ = 'o';
-+            *out++ = 's';
-+            *out++ = ';';
-         } else if ((*cur >= 0x20) || (*cur == '\n') || (*cur == '\t') ||
-                    (*cur == '\r')) {
-             /*
--- 
-1.6.0.6
-

libvirt-0.6.3-hostdev-managed.patch

@@ -1,45 +0,0 @@
-From 3d7771e0570e09096ad9391a857dad48b150bc0c Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Wed, 6 May 2009 16:33:28 +0100
-Subject: [PATCH] Fix qemu driver's interpretation of <hostdev managed='yes'/>
-
-This change:
-
-  Tue Mar  3 08:55:13 GMT 2009 Daniel P. Berrange <berrange@redhat.com>
-
-       Don't try to detach & reset PCI devices while running test
-       suite for XML-> ARGV conversion.
-       * src/qemu_driver.c: Add qemuPrepareHostDevices() helper to
-       detach and reset PCI devices.
-       * src/qemu_conf.c: Don't detach & reset PCI devices while
-       building the command line argv
-
-accidentally did this:
-
--            if (hostdev->managed) {
-+        if (!hostdev->managed) {
-
-Which results in managed='yes' not causing the device to be
-detached when the guest is starting.
-
-Signed-off-by: Mark McLoughlin <markmc@redhat.com>
----
- src/qemu_driver.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 5898026..59312c0 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -1215,7 +1215,7 @@ static int qemuPrepareHostDevices(virConnectPtr conn,
-         if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
-             continue;
- 
--        if (!hostdev->managed) {
-+        if (hostdev->managed) {
-             pciDevice *dev = pciGetDevice(conn,
-                                           hostdev->source.subsys.u.pci.domain,
-                                           hostdev->source.subsys.u.pci.bus,
--- 
-1.6.0.6
-

libvirt-0.6.3-refresh-qemu-caps.patch

@@ -1,76 +0,0 @@
-commit 0e51348cb9aeafe5e2fd6469a4bde0baa1eb8720
-Author: Cole Robinson <crobinso@redhat.com>
-Date:   Mon May 4 15:06:03 2009 -0400
-
-    Refresh QEMU driver capabilities for each getCapabilities call.
-    
-    Also fix up a couple issues where caps are accessed without locking
-    the driver structure.
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 23ea961..790dac6 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -1885,10 +1885,12 @@ static int qemudGetNodeInfo(virConnectPtr conn,
- 
- static char *qemudGetCapabilities(virConnectPtr conn) {
-     struct qemud_driver *driver = conn->privateData;
--    char *xml;
-+    char *xml = NULL;
- 
-     qemuDriverLock(driver);
--    if ((xml = virCapabilitiesFormatXML(driver->caps)) == NULL)
-+    virCapabilitiesFree(qemu_driver->caps);
-+    if ((qemu_driver->caps = qemudCapsInit()) == NULL ||
-+        (xml = virCapabilitiesFormatXML(driver->caps)) == NULL)
-         virReportOOMError(conn);
-     qemuDriverUnlock(driver);
- 
-@@ -3169,20 +3171,26 @@ cleanup:
-     return ret;
- }
- 
--static int qemudNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr secmodel)
-+static int qemudNodeGetSecurityModel(virConnectPtr conn,
-+                                     virSecurityModelPtr secmodel)
- {
-     struct qemud_driver *driver = (struct qemud_driver *)conn->privateData;
-     char *p;
-+    int ret = 0;
- 
--    if (!driver->securityDriver)
--        return -2;
-+    qemuDriverLock(driver);
-+    if (!driver->securityDriver) {
-+        ret = -2;
-+        goto cleanup;
-+    }
- 
-     p = driver->caps->host.secModel.model;
-     if (strlen(p) >= VIR_SECURITY_MODEL_BUFLEN-1) {
-         qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
-                          _("security model string exceeds max %d bytes"),
-                          VIR_SECURITY_MODEL_BUFLEN-1);
--        return -1;
-+        ret = -1;
-+        goto cleanup;
-     }
-     strcpy(secmodel->model, p);
- 
-@@ -3191,10 +3199,14 @@ static int qemudNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr sec
-         qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
-                          _("security DOI string exceeds max %d bytes"),
-                          VIR_SECURITY_DOI_BUFLEN-1);
--        return -1;
-+        ret = -1;
-+        goto cleanup;
-     }
-     strcpy(secmodel->doi, p);
--    return 0;
-+
-+cleanup:
-+    qemuDriverUnlock(driver);
-+    return ret;
- }
- 
- /* TODO: check seclabel restore */

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 @@
-3035b484861516a1cd425acef1e760e3  libvirt-0.6.2.tar.gz
+ae8535ce119d32a2e9fb1f46e2c8f325  libvirt-0.8.3.tar.gz