From 42b09f9429eb6b17c8245176c05ba1325f642fe3 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Sun, 21 Jan 2018 13:55:42 +0100 Subject: [PATCH] start: fix mainloop cleanup goto statements Signed-off-by: Christian Brauner --- src/lxc/start.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/lxc/start.c b/src/lxc/start.c index 41442a162..40c5d2d2f 100644 --- a/src/lxc/start.c +++ b/src/lxc/start.c @@ -545,22 +545,21 @@ 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; if (has_console) ret = lxc_mainloop(&descr_console, 0); - -out_mainloop: - lxc_mainloop_close(&descr); - TRACE("Closed mainloop"); - out_mainloop_console: if (has_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); -- 2.39.5