Revert "Fix: sessiond: erroneous user check logic in session_access_ok"

[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 daae9a55ba1d5308427a101f16e2416e9f4d46bb..e1065549997b72c933ae0bdd0fae145a2a7fec68 100644 (file)
--- a/src/bin/lttng-relayd/session.c
+++ b/src/bin/lttng-relayd/session.c
@@ -220,6 +220,7 @@ static int session_set_anonymous_chunk(struct relay_session *session)
                goto end;
        }
 
+       lttng_trace_chunk_set_fd_tracker(chunk, the_fd_tracker);
        status = lttng_trace_chunk_set_credentials_current_user(chunk);
        if (status != LTTNG_TRACE_CHUNK_STATUS_OK) {
                ret = -1;
@@ -232,8 +233,6 @@ static int session_set_anonymous_chunk(struct relay_session *session)
                goto end;
        }
 
-       lttng_trace_chunk_set_fd_tracker(chunk, the_fd_tracker);
-       output_directory = NULL;
        session->current_trace_chunk = chunk;
        chunk = NULL;
 end:
@@ -316,9 +315,20 @@ 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");
+               WARN("Session name exceeds maximal allowed length");
                goto error;
        }
        if (lttng_strncpy(session->hostname, hostname,
@@ -333,6 +343,12 @@ struct relay_session *session_create(const char *session_name,
        }
        if (creation_time) {
                LTTNG_OPTIONAL_SET(&session->creation_time, *creation_time);
+       } else {
+               LTTNG_OPTIONAL_SET(&session->creation_time, time(NULL));
+               if (session->creation_time.value == (time_t) -1) {
+                       PERROR("Failed to sample session creation time");
+                       goto error;
+               }
        }
        session->session_name_contains_creation_time =
                        session_name_contains_creation_time;
@@ -342,17 +358,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;
@@ -387,14 +394,14 @@ struct relay_session *session_create(const char *session_name,
                                        session->id_sessiond.value,
                                        *current_chunk_id);
                if (!session->current_trace_chunk) {
-                       char uuid_str[LTTNG_UUID_STR_LEN];
+                       char uuid_str[LTTNG_UUID_STR_LEN];
 
                        lttng_uuid_to_str(sessiond_uuid, uuid_str);
                        ERR("Could not find trace chunk: sessiond = {%s}, sessiond session id = %" PRIu64 ", trace chunk id = %" PRIu64,
                                        uuid_str, *id_sessiond,
                                        *current_chunk_id);
                        goto error;
-                }
+               }
 
                chunk_status = lttng_trace_chunk_get_session_output_directory_handle(
                                session->current_trace_chunk,