X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Frunas.c;h=7dee28abedc6ce1f2d518e32a7d64d5c1a6cd3f4;hb=45aad3a7fb17edf1aa382bc0a7f561758089d121;hp=bee107951d8664e6f111ed5ff260574407f0c3a3;hpb=730389d9ab1a479e172ff3aaa0adf12580bb344c;p=lttng-tools.git

diff --git a/src/common/runas.c b/src/common/runas.c
index bee107951..7dee28abe 100644
--- a/src/common/runas.c
+++ b/src/common/runas.c
@@ -38,8 +38,19 @@
 
 #define RUNAS_CHILD_STACK_SIZE	10485760
 
-#ifndef MAP_STACK
-#define MAP_STACK		0
+#ifdef __FreeBSD__
+/* FreeBSD MAP_STACK always return -ENOMEM */
+#define LTTNG_MAP_STACK		0
+#else
+#define LTTNG_MAP_STACK		MAP_STACK
+#endif
+
+#ifndef MAP_GROWSDOWN
+#define MAP_GROWSDOWN		0
+#endif
+
+#ifndef MAP_ANONYMOUS
+#define MAP_ANONYMOUS		MAP_ANON
 #endif
 
 struct run_as_data {
@@ -217,6 +228,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;
@@ -226,23 +238,22 @@ int run_as(int (*cmd)(void *data), void *data, uid_t uid, gid_t gid)
 	run_as_data.retval_pipe = retval_pipe[1];	/* write end */
 	child_stack = mmap(NULL, RUNAS_CHILD_STACK_SIZE,
 		PROT_WRITE | PROT_READ,
-		MAP_PRIVATE | MAP_GROWSDOWN | MAP_ANONYMOUS | MAP_STACK,
+		MAP_PRIVATE | MAP_GROWSDOWN | MAP_ANONYMOUS | LTTNG_MAP_STACK,
 		-1, 0);
 	if (child_stack == MAP_FAILED) {
 		perror("mmap");
-		ret = -ENOMEM;
+		retval.i = -ENOMEM;
 		goto close_pipe;
 	}
 	/*
 	 * Pointing to the middle of the stack to support architectures
 	 * where the stack grows up (HPPA).
 	 */
-	pid = clone(child_run_as, child_stack + (RUNAS_CHILD_STACK_SIZE / 2),
-		CLONE_FILES | SIGCHLD,
-		&run_as_data, NULL);
+	pid = lttng_clone_files(child_run_as, child_stack + (RUNAS_CHILD_STACK_SIZE / 2),
+		&run_as_data);
 	if (pid < 0) {
 		perror("clone");
-		ret = pid;
+		retval.i = pid;
 		goto unmap_stack;
 	}
 	/* receive return value */
@@ -266,12 +277,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]);