merge: fix parent death signal

3 files changed, 6 insertions, 9 deletions

diff --git a/src/firejail/join.c b/src/firejail/join.c
index 28fd1b290..89eddd8f1 100644
--- a/src/firejail/join.c
+++ b/src/firejail/join.c
@@ -295,8 +295,6 @@ void join(pid_t pid, int argc, char **argv, int index) {
                                 printf("changing root to %s\n", rootdir);
                 }
 
-                prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0); // kill the child in case the parent died
-
                 EUID_USER();
                 if (chdir("/") < 0)
                         errExit("chdir");
@@ -390,6 +388,7 @@ void join(pid_t pid, int argc, char **argv, int index) {
                 }
 
                 drop_privs(arg_nogroups);
+                prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0); // kill the child in case the parent died
                 start_application(0, NULL);
 
                 // it will never get here!!!
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index 240358923..2ac4952b7 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -856,8 +856,6 @@ int sandbox(void* sandbox_arg) {
         //****************************
         // set application environment
         //****************************
-        prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0); // kill the child in case the parent died
-
         EUID_USER();
         int cwd = 0;
         if (cfg.cwd) {
@@ -1004,6 +1002,7 @@ int sandbox(void* sandbox_arg) {
         // drop privileges, fork the application and monitor it
         //****************************************
         drop_privs(arg_nogroups);
+        prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0); // kill the child in case the parent died
         pid_t app_pid = fork();
         if (app_pid == -1)
                 errExit("fork");
@@ -1021,9 +1020,8 @@ int sandbox(void* sandbox_arg) {
                                 printf("AppArmor enabled\n");
                 }
 #endif
-
-                prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0); // kill the child in case the parent died
-                start_application(0, fp);       // start app
+                // start app
+                start_application(0, fp);
         }
 
         fclose(fp);
diff --git a/status b/status
index 6f1823530..a2d6fc116 100644
--- a/status
+++ b/status
@@ -1,8 +1,8 @@
-todo: Jan 13: ffix parent death signal
+Jan 13: fix parent death signal
 todo: Dec 17: join: also check proc file to detect nonewprivs bit
 todo: Sort items alphabetically in man firejail #2479, Feb 26
 todo: Alphabetical ordering of firecfg.config #2544, Mar 8
-todo: Fix incorrect parsing of --keep-var-tmp command #2587
+Mar 13: Fix incorrect parsing of --keep-var-tmp command #2587
 Mar 13: Avoid including globals.local twice, #2586
 Mar 10: fix --list reporting for sandboxes using --x11=none; to be ported Mar 10
 Mar 10: checking for invalid chars in profile filename before any other proce…