Merge pull request #363 from ligthyear/fixing-exit-code

Forward exit code from child process

2 files changed, 23 insertions, 7 deletions

diff --git a/src/firejail/main.c b/src/firejail/main.c
index e2f197a92..eebb04fcc 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -1778,7 +1778,8 @@ int main(int argc, char **argv) {
         signal (SIGTERM, my_handler);
         
         // wait for the child to finish
-        waitpid(child, NULL, 0);
+        int status = NULL;
+        waitpid(child, &status, 0);
 
         // free globals
 #ifdef HAVE_SECCOMP
@@ -1799,7 +1800,13 @@ int main(int argc, char **argv) {
                 }
         }
 
-        myexit(0);
+        if (WIFEXITED(status)){
+                myexit(WEXITSTATUS(status));
+        } else if (WIFSIGNALED(status)) {
+                myexit(WTERMSIG(status));
+        } else {
+                myexit(0);
+        }
 
         return 0;
 }
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index c51dcf927..044b2b244 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -130,11 +130,11 @@ static void chk_chroot(void) {
         exit(1);
 }
 
-static void monitor_application(pid_t app_pid) {
+static int monitor_application(pid_t app_pid) {
+        int status;
         while (app_pid) {
                 usleep(20000);
 
-                int status;
                 pid_t rv;
                 do {
                         rv = waitpid(-1, &status, 0);
@@ -172,6 +172,9 @@ static void monitor_application(pid_t app_pid) {
                         printf("Sandbox monitor: monitoring %u\n", app_pid);
         }
 
+        // return the latest exit status.
+        return status;
+
 #if 0
 // todo: find a way to shut down interfaces before closing the namespace
 // the problem is we don't have enough privileges to shutdown interfaces in this moment
@@ -682,7 +685,13 @@ int sandbox(void* sandbox_arg) {
                 start_application();    // start app
         }
 
-        monitor_application(app_pid);   // monitor application
-        
-        return 0;
+        int status = monitor_application(app_pid);      // monitor application
+
+        if WIFEXITED(status) {
+                // if we had a proper exit, return that exit status
+                return WEXITSTATUS(status);
+        } else {
+                // something else went wrong!
+                return -1;
+        }
 }