From 5b74eb3cd760f283659fa589de5a910f64a9aa90 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Sat, 30 Jun 2018 13:03:33 +0200 Subject: [PATCH] start: delete terminal on error Signed-off-by: Christian Brauner --- src/lxc/start.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lxc/start.c b/src/lxc/start.c index 9f5f50d53..a0bcd80bb 100644 --- a/src/lxc/start.c +++ b/src/lxc/start.c @@ -842,20 +842,22 @@ int lxc_init(const char *name, struct lxc_handler *handler) ret = lxc_terminal_map_ids(conf, &conf->console); if (ret < 0) { ERROR("Failed to chown console"); - goto out_restore_sigmask; + goto out_delete_terminal; } TRACE("Chowned console"); handler->cgroup_ops = cgroup_init(handler); if (!handler->cgroup_ops) { ERROR("Failed to initialize cgroup driver"); - goto out_restore_sigmask; + goto out_delete_terminal; } TRACE("Initialized cgroup driver"); INFO("Container \"%s\" is initialized", name); return 0; +out_delete_terminal: + lxc_terminal_delete(&handler->conf->console); out_restore_sigmask: (void)pthread_sigmask(SIG_SETMASK, &handler->oldmask, NULL); out_delete_tty: -- 2.39.5