Fix: streamline ret/errno of run_as()

[lttng-tools.git] / src / bin / lttng-sessiond / kernel-consumer.c

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index d71f8ce25c47b75ea32125d8b156f3a8a74e87a6..83771f2d75c8896d142a705066410c50023acaf4 100644 (file)
--- 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,