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

start: Detect early failure of the new child

Browse Source 
If the process in the new namespace dies very early
we have currently no chance to detect this.
The parent process will just die due to SIGPIPE
if it write to the fd used for synchronisation and
nobody will notice the real cause of the problem.

Install a SIGCHLD handler to detect the death.
Later when the child does execve() to the init within
the new namespace the handler will be disabled automatically.

Signed-off-by: Richard Weinberger <richard@nod.at>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Richard Weinberger 2013-04-16 23:42:23 +02:00 committed by Stéphane Graber
parent 6b28a08631
commit 5a5c35c3a0
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/lxc/start.c
View File

@ -198,6 +198,7 @@ static int setup_signal_fd(sigset_t *oldmask)
sigdelset(&mask, SIGILL) ||
sigdelset(&mask, SIGSEGV) ||
sigdelset(&mask, SIGBUS) ||
sigdelset(&mask, SIGCHLD) ||
sigprocmask(SIG_BLOCK, &mask, oldmask)) {
SYSERROR("failed to set signal mask");
return -1;
@ -739,10 +740,29 @@ int save_phys_nics(struct lxc_conf *conf)
return 0;
}
static void sigchild_handler(int sig)
{
int status;
pid_t child;
child = wait(&status);
if (child < 0) {
SYSERROR("SIGCHLD caught but wait() failed: %m\n");
return;
}
if (WIFSIGNALED(status))
ERROR("Process in the new namespace died before execve()"
" due to signal: %i", WTERMSIG(status));
else if (WIFEXITED(status))
ERROR("Process in the new namespace died before execve()"
" with exit code: %i", WIFEXITED(status));
}
int lxc_spawn(struct lxc_handler *handler)
{
int failed_before_rename = 0;
struct sigaction act;
const char *name = handler->name;
if (lxc_sync_init(handler))
@ -793,6 +813,14 @@ int lxc_spawn(struct lxc_handler *handler)
goto out_delete_net;
}
/*
* Install a SIGCHLD handler to detect the death of the new child between
* clone() and execve().
*/
memset(&act, 0, sizeof(act));
act.sa_handler = sigchild_handler;
sigaction(SIGCHLD, &act, NULL);
/* Create a process in a new set of namespaces */
handler->pid = lxc_clone(do_start, handler, handler->clone_flags);
if (handler->pid < 0) {