From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 26 Nov 2014 17:17:26 +0000 (-0500)
Subject: Fix: add missing sessiond kernel-consumer missing str*dup oom checks
X-Git-Tag: v2.5.3~27
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=dfc273736493c81fbad296b1f931e8086392256f;p=lttng-tools.git

Fix: add missing sessiond kernel-consumer missing str*dup oom checks

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index d71f8ce25..c5a3130bf 100644
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -48,6 +48,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);
@@ -65,6 +69,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 +107,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 +171,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,