Commit 7da8ab18 by Serge Hallyn Committed by Stéphane Graber

close inherited fds when we still have proc mounted

and don't close the sigfd Signed-off-by: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com>
parent 5112cd70
...@@ -650,6 +650,9 @@ static int do_start(void *data) ...@@ -650,6 +650,9 @@ static int do_start(void *data)
if (lsm_process_label_set(lsm_label, 1, 1) < 0) if (lsm_process_label_set(lsm_label, 1, 1) < 0)
goto out_warn_father; goto out_warn_father;
if (lxc_check_inherited(handler->conf, handler->sigfd))
return -1;
/* If we mounted a temporary proc, then unmount it now */ /* If we mounted a temporary proc, then unmount it now */
tmp_proc_unmount(handler->conf); tmp_proc_unmount(handler->conf);
...@@ -678,9 +681,6 @@ static int do_start(void *data) ...@@ -678,9 +681,6 @@ 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);
......
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