From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sun, 21 Jan 2018 12:55:42 +0000 (+0100)
Subject: start: fix mainloop cleanup goto statements
X-Git-Tag: lxc-2.0.10~379
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f6a1cb7e111e9cd7e5ffa74f32be5c17818df9b;p=thirdparty%2Flxc.git

start: fix mainloop cleanup goto statements

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 26229e311..f952998aa 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -541,18 +541,18 @@ int lxc_poll(const char *name, struct lxc_handler *handler)
 	close(descr.epfd);
 	descr.epfd = -EBADF;
 	if (ret < 0 || !handler->init_died)
-		goto out_mainloop;
+		goto out_mainloop_console;
 
 	ret = lxc_mainloop(&descr_console, 0);
 
-out_mainloop:
-	lxc_mainloop_close(&descr);
-	TRACE("Closed mainloop");
-
 out_mainloop_console:
 	lxc_mainloop_close(&descr_console);
 	TRACE("Closed console mainloop");
 
+out_mainloop:
+	lxc_mainloop_close(&descr);
+	TRACE("Closed mainloop");
+
 out_sigfd:
 	close(handler->sigfd);
 	TRACE("Closed signal file descriptor %d", handler->sigfd);