[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/1.1.0-3

[Guido Günther]

The following commit has been merged in the master branch:
commit 8369f65c21c5d6a9342d2de66a99743ec56a27cf
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Jul 16 16:03:11 2013 +0200

    Fix crash when multiple event callbacks were registered
    
    CVE-2013-2230
    
    Thanks: Ján Tomko
    Closes: #715559

diff --git a/debian/patches/Fix-crash-when-multiple-event-callbacks-were-registe.patch b/debian/patches/Fix-crash-when-multiple-event-callbacks-were-registe.patch
new file mode 100644
index 0000000..dad60a2
--- /dev/null
+++ b/debian/patches/Fix-crash-when-multiple-event-callbacks-were-registe.patch
@@ -0,0 +1,31 @@
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko at redhat.com>
+Date: Tue, 2 Jul 2013 15:17:09 +0200
+Subject: Fix crash when multiple event callbacks were registered
+
+CVE-2013-2230
+
+Don't overwrite the callback ID returned by
+virDomainEventStateRegisterID in ret by 0.
+
+Introduced by abf75aea.
+
+Closes: #715559
+---
+ src/qemu/qemu_driver.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index f51e766..9d6160f 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -9914,9 +9914,7 @@ qemuConnectDomainEventRegisterAny(virConnectPtr conn,
+                                       driver->domainEventState,
+                                       dom, eventID,
+                                       callback, opaque, freecb, &ret) < 0)
+-        goto cleanup;
+-
+-    ret = 0;
++        ret = -1;
+ 
+ cleanup:
+     return ret;
diff --git a/debian/patches/series b/debian/patches/series
index 9714647..d5acb6f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ Reduce-udevadm-settle-timeout-to-10-seconds.patch
 debian/Debianize-systemd-service-files.patch
 Allow-xen-toolstack-to-find-it-s-binaries.patch
 Create-directory-for-lease-files-if-it-s-missing.patch
+Fix-crash-when-multiple-event-callbacks-were-registe.patch

-- 
Libvirt Debian packaging