picnoir
/
nix-gh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use PR_SET_PDEATHSIG to ensure child cleanup

This commit is contained in:
Eelco Dolstra 2014-08-21 15:31:43 +02:00
parent 163fdf292e
commit 809ca33806
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libutil/util.cc
View File

@ -19,6 +19,10 @@
#include <sys/syscall.h>
#endif
#ifdef __linux__
#include <sys/prctl.h>
#endif
extern char * * environ;
@ -847,7 +851,8 @@ void killUser(uid_t uid)
//////////////////////////////////////////////////////////////////////
pid_t startProcess(std::function<void()> fun, const string & errorPrefix)
pid_t startProcess(std::function<void()> fun,
bool dieWithParent, const string & errorPrefix)
{
pid_t pid = fork();
if (pid == -1) throw SysError("unable to fork");
@ -855,6 +860,10 @@ pid_t startProcess(std::function<void()> fun, const string & errorPrefix)
if (pid == 0) {
_writeToStderr = 0;
try {
#if __linux__
if (dieWithParent && prctl(PR_SET_PDEATHSIG, SIGKILL) == -1)
throw SysError("setting death signal");
#endif
restoreAffinity();
fun();
} catch (std::exception & e) {

3
src/libutil/util.hh
View File

@ -267,7 +267,8 @@ void killUser(uid_t uid);
/* Fork a process that runs the given function, and return the child
pid to the caller. */
pid_t startProcess(std::function<void()> fun, const string & errorPrefix = "error: ");
pid_t startProcess(std::function<void()> fun, bool dieWithParent = true,
const string & errorPrefix = "error: ");
/* Run a program and return its stdout in a string (i.e., like the

2
src/nix-daemon/nix-daemon.cc
View File

@ -779,7 +779,7 @@ static void daemonLoop(char * * argv)
processConnection(trusted);
_exit(0);
}, "unexpected Nix daemon error: ");
}, false, "unexpected Nix daemon error: ");
} catch (Interrupted & e) {
throw;