From: Daniel P. Berrange <berrange@redhat.com>
Date: Mon, 9 Jul 2012 13:55:31 +0000 (+0100)
Subject: Fix shutdown of LXC controller
X-Git-Tag: CVE-2012-3445~178
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97d7f02dcc4848f5f7a64ecd5b32c9beffb7f359;p=thirdparty%2Flibvirt.git

Fix shutdown of LXC controller

Since we are not yet using the virNetServerPtr object for running
the event loop, we can't use virNetServerQuit(). Instead set the
global 'quit' flag in libvirt_lxc
---

diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index a4874ea3e5..7a1ce140d1 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -852,8 +852,11 @@ static void virLXCControllerSignalChildIO(virNetServerPtr server ATTRIBUTE_UNUSE
     int ret;
 
     ret = waitpid(-1, NULL, WNOHANG);
-    if (ret == ctrl->initpid)
-        virNetServerQuit(ctrl->server);
+    if (ret == ctrl->initpid) {
+        virMutexLock(&lock);
+        quit = true;
+        virMutexUnlock(&lock);
+    }
 }