X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=a8156cf12ed87f3f33a90f3e3fef8cf818f72420;hb=faf09bcfc465cdf7a5892339ee36b2dcef85b227;hp=7dca8ad05203b68944bd4fdd3e20e1dda2152d05;hpb=a440509044c2828bf6dbfb05e8d9d6d0277ce1a4;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 7dca8ad05..a8156cf12 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -17,6 +17,7 @@
  */
 
 #define _GNU_SOURCE
+#include <fcntl.h>
 #include <getopt.h>
 #include <grp.h>
 #include <limits.h>
@@ -294,22 +295,14 @@ static gid_t allowed_group(void)
  */
 static int init_thread_quit_pipe(void)
 {
-	int ret, i;
+	int ret;
 
-	ret = pipe(thread_quit_pipe);
+	ret = pipe2(thread_quit_pipe, O_CLOEXEC);
 	if (ret < 0) {
-		PERROR("thread quit pipe");
+		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;
 }
@@ -2879,12 +2872,11 @@ error:
 /*
  * Command LTTNG_CREATE_SESSION processed by the client thread.
  */
-static int cmd_create_session(char *name, char *path, lttng_sock_cred *creds)
+static int cmd_create_session(char *name, char *path, struct ucred *creds)
 {
 	int ret;
 
-	ret = session_create(name, path, LTTNG_SOCK_GET_UID_CRED(creds),
-			LTTNG_SOCK_GET_GID_CRED(creds));
+	ret = session_create(name, path, creds->uid, creds->gid);
 	if (ret != LTTCOMM_OK) {
 		goto error;
 	}
@@ -3134,10 +3126,25 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 {
 	int ret = LTTCOMM_OK;
 	int need_tracing_session = 1;
+	int need_domain;
 
 	DBG("Processing client command %d", cmd_ctx->lsm->cmd_type);
 
-	if (opt_no_kernel && cmd_ctx->lsm->domain.type == LTTNG_DOMAIN_KERNEL) {
+	switch (cmd_ctx->lsm->cmd_type) {
+	case LTTNG_CREATE_SESSION:
+	case LTTNG_DESTROY_SESSION:
+	case LTTNG_LIST_SESSIONS:
+	case LTTNG_LIST_DOMAINS:
+	case LTTNG_START_TRACE:
+	case LTTNG_STOP_TRACE:
+		need_domain = 0;
+		break;
+	default:
+		need_domain = 1;
+	}
+
+	if (opt_no_kernel && need_domain
+			&& cmd_ctx->lsm->domain.type == LTTNG_DOMAIN_KERNEL) {
 		ret = LTTCOMM_KERN_NA;
 		goto error;
 	}
@@ -3165,8 +3172,8 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 
 	/* Commands that DO NOT need a session. */
 	switch (cmd_ctx->lsm->cmd_type) {
-	case LTTNG_CALIBRATE:
 	case LTTNG_CREATE_SESSION:
+	case LTTNG_CALIBRATE:
 	case LTTNG_LIST_SESSIONS:
 	case LTTNG_LIST_TRACEPOINTS:
 		need_tracing_session = 0;
@@ -3191,6 +3198,9 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 		break;
 	}
 
+	if (!need_domain) {
+		goto skip_domain;
+	}
 	/*
 	 * Check domain type for specific "pre-action".
 	 */
@@ -3284,6 +3294,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 	default:
 		break;
 	}
+skip_domain:
 
 	/*
 	 * Check that the UID or GID match that of the tracing session.
@@ -3291,8 +3302,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 	 */
 	if (need_tracing_session) {
 		if (!session_access_ok(cmd_ctx->session,
-				LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds),
-				LTTNG_SOCK_GET_GID_CRED(&cmd_ctx->creds))) {
+				cmd_ctx->creds.uid, cmd_ctx->creds.gid)) {
 			ret = LTTCOMM_EPERM;
 			goto error;
 		}
@@ -3485,9 +3495,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 		unsigned int nr_sessions;
 
 		session_lock_list();
-		nr_sessions = lttng_sessions_count(
-				LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds),
-				LTTNG_SOCK_GET_GID_CRED(&cmd_ctx->creds));
+		nr_sessions = lttng_sessions_count(cmd_ctx->creds.uid, cmd_ctx->creds.gid);
 
 		ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_session) * nr_sessions);
 		if (ret < 0) {
@@ -3497,8 +3505,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 
 		/* Filled the session array */
 		list_lttng_sessions((struct lttng_session *)(cmd_ctx->llm->payload),
-			LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds),
-			LTTNG_SOCK_GET_GID_CRED(&cmd_ctx->creds));
+			cmd_ctx->creds.uid, cmd_ctx->creds.gid);
 
 		session_unlock_list();
 
@@ -3992,24 +3999,7 @@ end:
  */
 static int create_kernel_poll_pipe(void)
 {
-	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;
+	return pipe2(kernel_poll_pipe, O_CLOEXEC);
 }
 
 /*
@@ -4017,24 +4007,7 @@ error:
  */
 static int create_apps_cmd_pipe(void)
 {
-	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;
+	return pipe2(apps_cmd_pipe, O_CLOEXEC);
 }
 
 /*