Fix: test all close return values in sessiond

[lttng-tools.git] / src / common / runas.c

diff --git a/src/common/runas.c b/src/common/runas.c
index bee107951d8664e6f111ed5ff260574407f0c3a3..745a6d0d13643d2333ee1bfe5c8b3e4c8fe4fb3b 100644 (file)
--- a/src/common/runas.c
+++ b/src/common/runas.c
@@ -28,11 +28,9 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sched.h>
-#include <sys/signal.h>
+#include <sys/mman.h>
 
 #include <common/error.h>
-#include <common/compat/mman.h>
-#include <common/compat/clone.h>
 
 #include "runas.h"
 
@@ -217,6 +215,7 @@ int run_as(int (*cmd)(void *data), void *data, uid_t uid, gid_t gid)
        ret = pipe(retval_pipe);
        if (ret < 0) {
                perror("pipe");
+               retval.i = ret;
                goto end;
        }
        run_as_data.data = data;
@@ -230,7 +229,7 @@ int run_as(int (*cmd)(void *data), void *data, uid_t uid, gid_t gid)
                -1, 0);
        if (child_stack == MAP_FAILED) {
                perror("mmap");
-               ret = -ENOMEM;
+               retval.i = -ENOMEM;
                goto close_pipe;
        }
        /*
@@ -242,7 +241,7 @@ int run_as(int (*cmd)(void *data), void *data, uid_t uid, gid_t gid)
                &run_as_data, NULL);
        if (pid < 0) {
                perror("clone");
-               ret = pid;
+               retval.i = pid;
                goto unmap_stack;
        }
        /* receive return value */
@@ -266,12 +265,13 @@ int run_as(int (*cmd)(void *data), void *data, uid_t uid, gid_t gid)
        pid = waitpid(pid, &status, 0);
        if (pid < 0 || !WIFEXITED(status) || WEXITSTATUS(status) != 0) {
                perror("wait");
-               ret = -1;
+               retval.i = -1;
        }
 unmap_stack:
        ret = munmap(child_stack, RUNAS_CHILD_STACK_SIZE);
        if (ret < 0) {
                perror("munmap");
+               retval.i = ret;
        }
 close_pipe:
        close(retval_pipe[0]);