Fix: relayd: use of relay_session ref count before initialization

[lttng-tools.git] / src / bin / lttng-relayd / session.c

diff --git a/src/bin/lttng-relayd/session.c b/src/bin/lttng-relayd/session.c
index 3dcb1cd3367183f854c8b63b1daefd5a2360831f..f40f70965c97d6a1ceffdf85a066a7a282dd1d1c 100644 (file)
--- a/src/bin/lttng-relayd/session.c
+++ b/src/bin/lttng-relayd/session.c
@@ -9,11 +9,11 @@
 
 #define _LGPL_SOURCE
 #include <common/common.h>
-#include <common/uuid.h>
+#include <common/compat/path.h>
+#include <common/fd-tracker/utils.h>
 #include <common/time.h>
 #include <common/utils.h>
 #include <common/uuid.h>
-#include <common/compat/path.h>
 #include <urcu/rculist.h>
 
 #include <sys/stat.h>
@@ -196,7 +196,7 @@ static struct lttng_directory_handle *session_create_output_directory_handle(
                goto end;
        }
 
-       handle = lttng_directory_handle_create(full_session_path);
+       handle = fd_tracker_create_directory_handle(the_fd_tracker, full_session_path);
 end:
        pthread_mutex_unlock(&session->lock);
        free(full_session_path);
@@ -316,6 +316,17 @@ struct relay_session *session_create(const char *session_name,
                PERROR("Failed to allocate session");
                goto error;
        }
+
+       pthread_mutex_lock(&last_relay_session_id_lock);
+       session->id = ++last_relay_session_id;
+       pthread_mutex_unlock(&last_relay_session_id_lock);
+
+       lttng_ht_node_init_u64(&session->session_n, session->id);
+       urcu_ref_init(&session->ref);
+       CDS_INIT_LIST_HEAD(&session->recv_list);
+       pthread_mutex_init(&session->lock, NULL);
+       pthread_mutex_init(&session->recv_list_lock, NULL);
+
        if (lttng_strncpy(session->session_name, session_name,
                        sizeof(session->session_name))) {
                WARN("Session name exceeds maximal allowed length");
@@ -342,17 +353,8 @@ struct relay_session *session_create(const char *session_name,
                goto error;
        }
 
-       pthread_mutex_lock(&last_relay_session_id_lock);
-       session->id = ++last_relay_session_id;
-       pthread_mutex_unlock(&last_relay_session_id_lock);
-
        session->major = major;
        session->minor = minor;
-       lttng_ht_node_init_u64(&session->session_n, session->id);
-       urcu_ref_init(&session->ref);
-       CDS_INIT_LIST_HEAD(&session->recv_list);
-       pthread_mutex_init(&session->lock, NULL);
-       pthread_mutex_init(&session->recv_list_lock, NULL);
 
        session->live_timer = live_timer;
        session->snapshot = snapshot;