X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel-consumer.c;h=6cda088d9e5e7600174476d29962adf2bd532189;hb=88f06f1562c6ecd3a5666baa93a57273fbe10437;hp=f634cd362a74fd810622d8d49c28397c137b4a27;hpb=6c1c0768320135c6936c371b09731851b508c023;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index f634cd362..6cda088d9 100644
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -49,6 +49,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;
+		}
 
 		/* Create directory */
 		ret = run_as_mkdir_recursive(pathname, S_IRWXU | S_IRWXG, uid, gid);
@@ -66,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);
 	}
 
@@ -100,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,
@@ -164,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,