From: Ján Tomko <jtomko@redhat.com>
Date: Tue, 2 Jul 2013 13:17:09 +0000 (+0200)
Subject: Fix crash when multiple event callbacks were registered
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b0b662059c8c87354d8417216baec1af3abc07c;p=thirdparty%2Flibvirt.git

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.
(cherry picked from commit f38c8185f97720ecae7ef2291fbaa5d6b0209e17)
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index f066b232a7..56e1645f21 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;