From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 2 Feb 2017 15:42:18 +0000 (+0100)
Subject: tests: qemuhotplug: Don't free the monitor object as part of @vm
X-Git-Tag: CVE-2017-2635~195
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5550dde150acb0f704bb8f8afb0cd35cb583d90b;p=thirdparty%2Flibvirt.git

tests: qemuhotplug: Don't free the monitor object as part of @vm

The test monitor should be freed separately so we need to remove the
pointer from the @vm object. This fixes a race condition crash in the
test introduced in commit a245abce43.
---

diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 8cceb883ed..8a58d5468c 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -365,6 +365,8 @@ struct testQemuHotplugCpuData {
 static void
 testQemuHotplugCpuDataFree(struct testQemuHotplugCpuData *data)
 {
+    qemuDomainObjPrivatePtr priv;
+
     if (!data)
         return;
 
@@ -375,7 +377,13 @@ testQemuHotplugCpuDataFree(struct testQemuHotplugCpuData *data)
 
     VIR_FREE(data->xml_dom);
 
-    virObjectUnref(data->vm);
+    if (data->vm) {
+        priv = data->vm->privateData;
+        priv->mon = NULL;
+
+        virObjectUnref(data->vm);
+    }
+
     qemuMonitorTestFree(data->mon);
     VIR_FREE(data);
 }