diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2017-12-06 09:44:21 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2017-12-06 10:34:58 +0100 |
| commit | 71ac44a0c25ff6c56c29e47f864e9e0ebf167ffc (patch) | |
| tree | a7c484d583cf82033d773e91f5d096bc034c17f4 /executor/common_linux.h | |
| parent | e8062ae15f9c400ee4ae5d4b04baecf23cf16852 (diff) | |
executor: fix build
exitf function was not defined with some combinations of options in csource.
Fix defines and switch exitf back to fail, fail already checks ENOMEM/EAGAIN,
so there is no reason to use exitf in this particular case.
Diffstat (limited to 'executor/common_linux.h')
| -rw-r--r-- | executor/common_linux.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/executor/common_linux.h b/executor/common_linux.h index b405b999b..a28783ee1 100644 --- a/executor/common_linux.h +++ b/executor/common_linux.h @@ -723,7 +723,7 @@ static int do_sandbox_none(int executor_pid, bool enable_tun) unshare(CLONE_NEWPID); int pid = fork(); if (pid < 0) - exitf("sandbox fork failed"); + fail("sandbox fork failed"); if (pid) return pid; @@ -743,7 +743,7 @@ static int do_sandbox_setuid(int executor_pid, bool enable_tun) unshare(CLONE_NEWPID); int pid = fork(); if (pid < 0) - exitf("sandbox fork failed"); + fail("sandbox fork failed"); if (pid) return pid; @@ -876,7 +876,7 @@ static int do_sandbox_namespace(int executor_pid, bool enable_tun) pid = clone(namespace_sandbox_proc, &sandbox_stack[sizeof(sandbox_stack) - 64], CLONE_NEWUSER | CLONE_NEWPID, NULL); if (pid < 0) - exitf("sandbox clone failed"); + fail("sandbox clone failed"); return pid; } #endif @@ -1011,7 +1011,7 @@ void loop() #endif int pid = fork(); if (pid < 0) - exitf("loop fork failed"); + fail("loop fork failed"); if (pid == 0) { prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0); setpgrp(); |