X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel-consumer.c;h=247894968534e0fdcaf53fdffaaa2b7d57a8ff19;hp=10011f4cd109b4b630abd615ca4d8256b36ccd03;hb=1fc1b7c8ac91a5d3a468ee64a862f4df9592b1c5;hpb=2b29c638278807c1536634ce49f0c9c053b3ab5f

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index 10011f4cd..247894968 100644
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -52,6 +52,13 @@ static char *create_channel_path(struct consumer_output *consumer,
 		if (ret < 0) {
 			PERROR("snprintf kernel channel path");
 			goto error;
+		} else if (ret >= sizeof(tmp_path)) {
+			ERR("Kernel channel path exceeds the maximal allowed length of of %zu bytes (%i bytes required) with path \"%s%s%s\"",
+					sizeof(tmp_path), ret,
+					consumer->dst.session_root_path,
+					consumer->chunk_path,
+					consumer->subdir);
+			goto error;
 		}
 		pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
 		if (!pathname) {
@@ -75,6 +82,12 @@ static char *create_channel_path(struct consumer_output *consumer,
 		if (ret < 0) {
 			PERROR("snprintf kernel metadata path");
 			goto error;
+		} else if (ret >= sizeof(tmp_path)) {
+			ERR("Kernel channel path exceeds the maximal allowed length of of %zu bytes (%i bytes required) with path \"%s%s\"",
+					sizeof(tmp_path), ret,
+					consumer->dst.net.base_dir,
+					consumer->subdir);
+			goto error;
 		}
 		pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
 		if (!pathname) {
@@ -132,8 +145,7 @@ int kernel_consumer_add_channel(struct consumer_socket *sock,
 	}
 
 	/* Prep channel message structure */
-	consumer_init_channel_comm_msg(&lkm,
-			LTTNG_CONSUMER_ADD_CHANNEL,
+	consumer_init_add_channel_comm_msg(&lkm,
 			channel->key,
 			ksession->id,
 			pathname,
@@ -216,9 +228,8 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
 	}
 
 	/* Prep channel message structure */
-	consumer_init_channel_comm_msg(&lkm,
-			LTTNG_CONSUMER_ADD_CHANNEL,
-			session->metadata->fd,
+	consumer_init_add_channel_comm_msg(&lkm,
+			session->metadata->key,
 			session->id,
 			pathname,
 			session->uid,
@@ -243,7 +254,7 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
 	/* Prep stream message structure */
 	consumer_init_stream_comm_msg(&lkm,
 			LTTNG_CONSUMER_ADD_STREAM,
-			session->metadata->fd,
+			session->metadata->key,
 			session->metadata_stream_fd,
 			0); /* CPU: 0 for metadata. */
 
@@ -346,7 +357,7 @@ error:
  *
  * The consumer socket lock must be held by the caller.
  */
-int kernel_consumer_send_channel_stream(struct consumer_socket *sock,
+int kernel_consumer_send_channel_streams(struct consumer_socket *sock,
 		struct ltt_kernel_channel *channel, struct ltt_kernel_session *session,
 		unsigned int monitor)
 {
@@ -433,7 +444,7 @@ int kernel_consumer_send_session(struct consumer_socket *sock,
 
 	/* Send channel and streams of it */
 	cds_list_for_each_entry(chan, &session->channel_list.head, list) {
-		ret = kernel_consumer_send_channel_stream(sock, chan, session,
+		ret = kernel_consumer_send_channel_streams(sock, chan, session,
 				monitor);
 		if (ret < 0) {
 			goto error;
@@ -497,11 +508,11 @@ int kernel_consumer_destroy_metadata(struct consumer_socket *socket,
 	assert(metadata);
 	assert(socket);
 
-	DBG("Sending kernel consumer destroy channel key %d", metadata->fd);
+	DBG("Sending kernel consumer destroy channel key %" PRIu64, metadata->key);
 
 	memset(&msg, 0, sizeof(msg));
 	msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
-	msg.u.destroy_channel.key = metadata->fd;
+	msg.u.destroy_channel.key = metadata->key;
 
 	pthread_mutex_lock(socket->lock);
 	health_code_update();