X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel-consumer.c;h=83771f2d75c8896d142a705066410c50023acaf4;hb=03e431550191df8609f921c7b4054c57ee4644d8;hp=89c8760d2673bbda82f20ef2b308b95f7ec3d17f;hpb=4ce9ff516705a70c0063b55c9ca976cd672770e2;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index 89c8760d2..83771f2d7 100644
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -48,11 +49,15 @@ static char *create_channel_path(struct consumer_output *consumer,
 			goto error;
 		}
 		pathname = strndup(tmp_path, sizeof(tmp_path));
+		if (!pathname) {
+			PERROR("strndup");
+			goto error;
+		}
 
 		/* Create directory */
 		ret = run_as_mkdir_recursive(pathname, S_IRWXU | S_IRWXG, uid, gid);
 		if (ret < 0) {
-			if (ret != -EEXIST) {
+			if (errno != EEXIST) {
 				ERR("Trace directory creation error");
 				goto error;
 			}
@@ -65,6 +70,10 @@ static char *create_channel_path(struct consumer_output *consumer,
 			goto error;
 		}
 		pathname = strndup(tmp_path, sizeof(tmp_path));
+		if (!pathname) {
+			PERROR("strndup");
+			goto error;
+		}
 		DBG3("Kernel network consumer subdir path: %s", pathname);
 	}
 
@@ -99,14 +108,14 @@ int kernel_consumer_add_channel(struct consumer_socket *sock,
 
 	if (monitor) {
 		pathname = create_channel_path(consumer, session->uid, session->gid);
-		if (!pathname) {
-			ret = -1;
-			goto error;
-		}
 	} else {
 		/* Empty path. */
 		pathname = strdup("");
 	}
+	if (!pathname) {
+		ret = -1;
+		goto error;
+	}
 
 	/* Prep channel message structure */
 	consumer_init_channel_comm_msg(&lkm,
@@ -163,14 +172,14 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
 
 	if (monitor) {
 		pathname = create_channel_path(consumer, session->uid, session->gid);
-		if (!pathname) {
-			ret = -1;
-			goto error;
-		}
 	} else {
 		/* Empty path. */
 		pathname = strdup("");
 	}
+	if (!pathname) {
+		ret = -1;
+		goto error;
+	}
 
 	/* Prep channel message structure */
 	consumer_init_channel_comm_msg(&lkm,
@@ -373,7 +382,7 @@ int kernel_consumer_send_session(struct consumer_socket *sock,
 
 	DBG("Sending session stream to kernel consumer");
 
-	if (session->metadata_stream_fd >= 0) {
+	if (session->metadata_stream_fd >= 0 && session->metadata) {
 		ret = kernel_consumer_add_metadata(sock, session, monitor);
 		if (ret < 0) {
 			goto error;