proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-06 23:14:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

close inherited fds when we still have proc mounted

Browse Source 
and don't close the sigfd

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Serge Hallyn 2014-02-15 12:50:31 -06:00 committed by Stéphane Graber
parent 5112cd7090
commit 7da8ab18d9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lxc/start.c
View File

@ -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)
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);