X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=736ec83ff8712d891f92d3a2724f7085672b924f;hb=b662582bf448d2fad2f5990580771733a3b33d16;hp=6bc8b00e914b1d1d6a15c6e82d2e0f520609afcc;hpb=622c9ecfa3a7665e2981aaa4881f58afe07106ce;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 6bc8b00e9..736ec83ff 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -928,6 +928,12 @@ restart:
 		goto error;
 	}
 
+	/*
+	 * Set the CLOEXEC flag. Return code is useless because either way, the
+	 * show must go on.
+	 */
+	(void) utils_set_fd_cloexec(sock);
+
 	health_code_update(&consumer_data->health);
 
 	DBG2("Receiving code from consumer err_sock");
@@ -1402,6 +1408,12 @@ static void *thread_registration_apps(void *data)
 						goto error;
 					}
 
+					/*
+					 * Set the CLOEXEC flag. Return code is useless because
+					 * either way, the show must go on.
+					 */
+					(void) utils_set_fd_cloexec(sock);
+
 					/* Create UST registration command for enqueuing */
 					ust_cmd = zmalloc(sizeof(struct ust_command));
 					if (ust_cmd == NULL) {
@@ -2408,7 +2420,7 @@ skip_domain:
 		ret = cmd_add_context(cmd_ctx->session, cmd_ctx->lsm->domain.type,
 				cmd_ctx->lsm->u.context.channel_name,
 				cmd_ctx->lsm->u.context.event_name,
-				&cmd_ctx->lsm->u.context.ctx);
+				&cmd_ctx->lsm->u.context.ctx, kernel_poll_pipe[1]);
 		break;
 	}
 	case LTTNG_DISABLE_CHANNEL:
@@ -2882,6 +2894,12 @@ static void *thread_manage_health(void *data)
 		goto error;
 	}
 
+	/*
+	 * Set the CLOEXEC flag. Return code is useless because either way, the
+	 * show must go on.
+	 */
+	(void) utils_set_fd_cloexec(sock);
+
 	ret = lttcomm_listen_unix_sock(sock);
 	if (ret < 0) {
 		goto error;
@@ -2946,6 +2964,12 @@ restart:
 			goto error;
 		}
 
+		/*
+		 * Set the CLOEXEC flag. Return code is useless because either way, the
+		 * show must go on.
+		 */
+		(void) utils_set_fd_cloexec(new_sock);
+
 		DBG("Receiving data from client for health...");
 		ret = lttcomm_recv_unix_sock(new_sock, (void *)&msg, sizeof(msg));
 		if (ret <= 0) {
@@ -3143,6 +3167,12 @@ static void *thread_manage_clients(void *data)
 			goto error;
 		}
 
+		/*
+		 * Set the CLOEXEC flag. Return code is useless because either way, the
+		 * show must go on.
+		 */
+		(void) utils_set_fd_cloexec(sock);
+
 		/* Set socket option for credentials retrieval */
 		ret = lttcomm_setsockopt_creds_unix_sock(sock);
 		if (ret < 0) {
@@ -3443,6 +3473,14 @@ static int init_daemon_socket(void)
 		goto end;
 	}
 
+	/* Set the cloexec flag */
+	ret = utils_set_fd_cloexec(client_sock);
+	if (ret < 0) {
+		ERR("Unable to set CLOEXEC flag to the client Unix socket (fd: %d). "
+				"Continuing but note that the consumer daemon will have a "
+				"reference to this socket on exec()", client_sock);
+	}
+
 	/* File permission MUST be 660 */
 	ret = chmod(client_unix_sock_path, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
 	if (ret < 0) {
@@ -3459,6 +3497,14 @@ static int init_daemon_socket(void)
 		goto end;
 	}
 
+	/* Set the cloexec flag */
+	ret = utils_set_fd_cloexec(apps_sock);
+	if (ret < 0) {
+		ERR("Unable to set CLOEXEC flag to the app Unix socket (fd: %d). "
+				"Continuing but note that the consumer daemon will have a "
+				"reference to this socket on exec()", apps_sock);
+	}
+
 	/* File permission MUST be 666 */
 	ret = chmod(apps_unix_sock_path,
 			S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
@@ -3468,6 +3514,9 @@ static int init_daemon_socket(void)
 		goto end;
 	}
 
+	DBG3("Session daemon client socket %d and application socket %d created",
+			client_sock, apps_sock);
+
 end:
 	umask(old_umask);
 	return ret;