Skip to content

L
lxc
Commit 1d167857 by Serge Hallyn Committed by Stéphane Graber
Options

lxc-start: close inherited fds right before exec

Not before we've even forked. Signed-off-by: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com> Acked-by: 's avatarStéphane Graber <stgraber@ubuntu.com>
parent 93c379f0
Showing with 3 additions and 3 deletions
src/lxc/start.c
...@@ -676,6 +676,9 @@ static int do_start(void *data) ...@@ -676,6 +676,9 @@ static int do_start(void *data)
close(handler->sigfd); close(handler->sigfd);
if (lxc_check_inherited(handler->conf, -1))
return -1;
/* after this call, we are in error because this /* after this call, we are in error because this
* ops should not return as it execs */ * ops should not return as it execs */
handler->ops->start(handler, handler->data); handler->ops->start(handler, handler->data);
...@@ -1030,9 +1033,6 @@ int lxc_start(const char *name, char *const argv[], struct lxc_conf *conf, ...@@ -1030,9 +1033,6 @@ int lxc_start(const char *name, char *const argv[], struct lxc_conf *conf,
.argv = argv, .argv = argv,
}; };
if (lxc_check_inherited(conf, -1))
return -1;
conf->need_utmp_watch = 1; conf->need_utmp_watch = 1;
return __lxc_start(name, conf, &start_ops, &start_arg, lxcpath); return __lxc_start(name, conf, &start_ops, &start_arg, lxcpath);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment