From bb3c4e70f3dc7550185398d88b07081e97c0ad22 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 26 Nov 2014 12:17:26 -0500 Subject: [PATCH] Fix: add missing sessiond kernel-consumer missing str*dup oom checks MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Mathieu Desnoyers Signed-off-by: Jérémie Galarneau --- src/bin/lttng-sessiond/kernel-consumer.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) 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, -- 2.34.1