X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=b275874e7bc98dc3062b27c7529479326ef1b9bc;hb=80e327fa80045f6b470ac76963fc4b5d396a80a9;hp=ff29eb03566775b8cc351296f4dab543a732cc0a;hpb=03550b580b6963b009582a01dc9cd86f29494e9d;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index ff29eb035..b275874e7 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -17,7 +17,6 @@
  */
 
 #define _GNU_SOURCE
-#include <fcntl.h>
 #include <getopt.h>
 #include <grp.h>
 #include <limits.h>
@@ -40,6 +39,7 @@
 
 #include <common/common.h>
 #include <common/compat/poll.h>
+#include <common/compat/socket.h>
 #include <common/defaults.h>
 #include <common/kernel-consumer/kernel-consumer.h>
 #include <common/ust-consumer/ust-consumer.h>
@@ -301,14 +301,22 @@ static gid_t allowed_group(void)
  */
 static int init_thread_quit_pipe(void)
 {
-	int ret;
+	int ret, i;
 
-	ret = pipe2(thread_quit_pipe, O_CLOEXEC);
+	ret = pipe(thread_quit_pipe);
 	if (ret < 0) {
 		PERROR("thread quit pipe");
 		goto error;
 	}
 
+	for (i = 0; i < 2; i++) {
+		ret = fcntl(thread_quit_pipe[i], F_SETFD, FD_CLOEXEC);
+		if (ret < 0) {
+			PERROR("fcntl");
+			goto error;
+		}
+	}
+
 error:
 	return ret;
 }
@@ -1845,7 +1853,11 @@ error_open:
 error:
 	WARN("No kernel tracer available");
 	kernel_tracer_fd = -1;
-	return LTTCOMM_KERN_NA;
+	if (!is_root) {
+		return LTTCOMM_NEED_ROOT_SESSIOND;
+	} else {
+		return LTTCOMM_KERN_NA;
+	}
 }
 
 /*
@@ -2838,7 +2850,8 @@ static int cmd_start_trace(struct ltt_session *session)
 	usess = session->ust_session;
 
 	if (session->enabled) {
-		ret = LTTCOMM_UST_START_FAIL;
+		/* Already started. */
+		ret = LTTCOMM_TRACE_ALREADY_STARTED;
 		goto error;
 	}
 
@@ -2930,7 +2943,7 @@ static int cmd_stop_trace(struct ltt_session *session)
 	usess = session->ust_session;
 
 	if (!session->enabled) {
-		ret = LTTCOMM_UST_STOP_FAIL;
+		ret = LTTCOMM_TRACE_ALREADY_STOPPED;
 		goto error;
 	}
 
@@ -2981,11 +2994,12 @@ error:
 /*
  * Command LTTNG_CREATE_SESSION processed by the client thread.
  */
-static int cmd_create_session(char *name, char *path, struct ucred *creds)
+static int cmd_create_session(char *name, char *path, lttng_sock_cred *creds)
 {
 	int ret;
 
-	ret = session_create(name, path, creds->uid, creds->gid);
+	ret = session_create(name, path, LTTNG_SOCK_GET_UID_CRED(creds),
+			LTTNG_SOCK_GET_GID_CRED(creds));
 	if (ret != LTTCOMM_OK) {
 		goto error;
 	}
@@ -3254,7 +3268,11 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 
 	if (opt_no_kernel && need_domain
 			&& cmd_ctx->lsm->domain.type == LTTNG_DOMAIN_KERNEL) {
-		ret = LTTCOMM_KERN_NA;
+		if (!is_root) {
+			ret = LTTCOMM_NEED_ROOT_SESSIOND;
+		} else {
+			ret = LTTCOMM_KERN_NA;
+		}
 		goto error;
 	}
 
@@ -3316,7 +3334,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 	switch (cmd_ctx->lsm->domain.type) {
 	case LTTNG_DOMAIN_KERNEL:
 		if (!is_root) {
-			ret = LTTCOMM_KERN_NA;
+			ret = LTTCOMM_NEED_ROOT_SESSIOND;
 			goto error;
 		}
 
@@ -3411,7 +3429,8 @@ skip_domain:
 	 */
 	if (need_tracing_session) {
 		if (!session_access_ok(cmd_ctx->session,
-				cmd_ctx->creds.uid, cmd_ctx->creds.gid)) {
+				LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds),
+				LTTNG_SOCK_GET_GID_CRED(&cmd_ctx->creds))) {
 			ret = LTTCOMM_EPERM;
 			goto error;
 		}
@@ -3604,7 +3623,9 @@ skip_domain:
 		unsigned int nr_sessions;
 
 		session_lock_list();
-		nr_sessions = lttng_sessions_count(cmd_ctx->creds.uid, cmd_ctx->creds.gid);
+		nr_sessions = lttng_sessions_count(
+				LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds),
+				LTTNG_SOCK_GET_GID_CRED(&cmd_ctx->creds));
 
 		ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_session) * nr_sessions);
 		if (ret < 0) {
@@ -3614,7 +3635,8 @@ skip_domain:
 
 		/* Filled the session array */
 		list_lttng_sessions((struct lttng_session *)(cmd_ctx->llm->payload),
-			cmd_ctx->creds.uid, cmd_ctx->creds.gid);
+			LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds),
+			LTTNG_SOCK_GET_GID_CRED(&cmd_ctx->creds));
 
 		session_unlock_list();
 
@@ -4134,7 +4156,24 @@ end:
  */
 static int create_kernel_poll_pipe(void)
 {
-	return pipe2(kernel_poll_pipe, O_CLOEXEC);
+	int ret, i;
+
+	ret = pipe(kernel_poll_pipe);
+	if (ret < 0) {
+		PERROR("kernel poll pipe");
+		goto error;
+	}
+
+	for (i = 0; i < 2; i++) {
+		ret = fcntl(kernel_poll_pipe[i], F_SETFD, FD_CLOEXEC);
+		if (ret < 0) {
+			PERROR("fcntl kernel_poll_pipe");
+			goto error;
+		}
+	}
+
+error:
+	return ret;
 }
 
 /*
@@ -4143,7 +4182,24 @@ static int create_kernel_poll_pipe(void)
  */
 static int create_apps_cmd_pipe(void)
 {
-	return pipe2(apps_cmd_pipe, O_CLOEXEC);
+	int ret, i;
+
+	ret = pipe(apps_cmd_pipe);
+	if (ret < 0) {
+		PERROR("apps cmd pipe");
+		goto error;
+	}
+
+	for (i = 0; i < 2; i++) {
+		ret = fcntl(apps_cmd_pipe[i], F_SETFD, FD_CLOEXEC);
+		if (ret < 0) {
+			PERROR("fcntl apps_cmd_pipe");
+			goto error;
+		}
+	}
+
+error:
+	return ret;
 }
 
 /*