reset signal mask when forking

2 files changed, 11 insertions, 1 deletions

diff --git a/execute.c b/execute.c
index 5def5ce1af..6b1d4a1da1 100644
--- a/execute.c
+++ b/execute.c
@@ -6,6 +6,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
+#include <signal.h>
 
 #include "execute.h"
 #include "strv.h"
@@ -121,8 +122,16 @@ int exec_spawn(const ExecCommand *command, const ExecContext *context, int *fds,
                 char **e, **f = NULL;
                 int i, r;
                 char t[16];
+                sigset_t ss;
+
                 /* child */
 
+                if (sigemptyset(&ss) < 0 ||
+                    sigprocmask(SIG_SETMASK, &ss, NULL) < 0) {
+                        r = EXIT_SIGNAL_MASK;
+                        goto fail;
+                }
+
                 umask(context->umask);
 
                 if (chdir(context->directory ? context->directory : "/") < 0) {
diff --git a/execute.h b/execute.h
index d339af93dc..b7dbe68491 100644
--- a/execute.h
+++ b/execute.h
@@ -71,7 +71,8 @@ typedef enum ExitStatus {
         EXIT_EXEC,
         EXIT_MEMORY,
         EXIT_LIMITS,
-        EXIT_OOM_ADJUST
+        EXIT_OOM_ADJUST,
+        EXIT_SIGNAL_MASK
 } ExitStatus;
 
 int exec_spawn(const ExecCommand *command, const ExecContext *context, int *fds, unsigned n_fds, pid_t *ret);