Fix: expand load path to an absolute path before daemonizing

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

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index d5759b39180d1d789d7171ef6b5c68202ac03c01..f0765f07ca408147863bad83abc2dc1cecd3810c 100644 (file)
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -4441,8 +4441,17 @@ static void *thread_manage_clients(void *data)
                if (ret > 0 || (ret < 0 && errno != EINTR)) {
                        goto exit;
                }
-               cmm_smp_rmb();
        }
+       /*
+        * This barrier is paired with the one in sessiond_notify_ready() to
+        * ensure that loads accessing data initialized by the other threads,
+        * on which this thread was waiting, are not performed before this point.
+        *
+        * Note that this could be a 'read' memory barrier, but a full barrier
+        * is used in case the code changes. The performance implications of
+        * this choice are minimal since this is a slow path.
+        */
+       cmm_smp_mb();
 
        /* This testpoint is after we signal readiness to the parent. */
        if (testpoint(sessiond_thread_manage_clients)) {
@@ -4969,10 +4978,10 @@ static int set_option(int opt, const char *arg, const char *optname)
                                "-l, --load");
                } else {
                        free(opt_load_session_path);
-                       opt_load_session_path = strdup(arg);
+                       opt_load_session_path = utils_expand_path(arg);
                        if (!opt_load_session_path) {
-                               PERROR("strdup");
-                               ret = -ENOMEM;
+                               ERR("Failed to expand load path %s", arg);
+                               ret = -EINVAL;
                        }
                }
        } else if (string_match(optname, "kmod-probes")) {