X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel-consumer.c;h=74c4b302320de5b49926f1ff497c31b59f4fb9fa;hb=dba13f1d5dffdd2ecaa14ba8ff88c27805153016;hp=20a7efb402a2314a9fcc006dbf4c84439e5a099f;hpb=366a9222abc182bf77de1b806256aa9a9dc8832a;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index 20a7efb40..74c4b3023 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) {
@@ -69,10 +76,18 @@ static char *create_channel_path(struct consumer_output *consumer,
 		}
 		DBG3("Kernel local consumer tracefile path: %s", pathname);
 	} else {
-		ret = snprintf(tmp_path, sizeof(tmp_path), "%s", consumer->subdir);
+		ret = snprintf(tmp_path, sizeof(tmp_path), "%s%s",
+				consumer->dst.net.base_dir,
+				consumer->subdir);
 		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) {
@@ -216,7 +231,7 @@ 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,
+			session->metadata->key,
 			session->id,
 			pathname,
 			session->uid,
@@ -241,7 +256,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. */
 
@@ -495,11 +510,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();