Fix: sessiond: Dereference after null check

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

diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index aaa2129419cf76d092c4e4b397669c44e7efc99b..05627f9345d6151e28db2a3534a99c9f1b5d08b9 100644 (file)
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -216,7 +216,7 @@ void rotation_thread_enqueue_job(struct rotation_thread_timer_queue *queue,
                struct ltt_session *session)
 {
        int ret;
-       const char * const dummy = "!";
+       const char dummy = '!';
        struct rotation_thread_job *job = NULL;
        const char *job_type_str = get_job_type_str(job_type);
 
@@ -242,8 +242,8 @@ void rotation_thread_enqueue_job(struct rotation_thread_timer_queue *queue,
        job->type = job_type;
        cds_list_add_tail(&job->head, &queue->list);
 
-       ret = lttng_write(lttng_pipe_get_writefd(queue->event_pipe), dummy,
-                       1);
+       ret = lttng_write(lttng_pipe_get_writefd(queue->event_pipe), &dummy,
+                       sizeof(dummy));
        if (ret < 0) {
                /*
                 * We do not want to block in the timer handler, the job has
@@ -489,15 +489,14 @@ int check_session_rotation_pending(struct ltt_session *session,
         */
        ret = timer_session_rotation_pending_check_stop(session);
        if (ret) {
-               goto end;
+               goto check_ongoing_rotation;
        }
 
        check_session_rotation_pending_on_consumers(session,
                        &rotation_completed);
-
        if (!rotation_completed ||
                        session->rotation_state == LTTNG_ROTATION_STATE_ERROR) {
-               goto end;
+               goto check_ongoing_rotation;
        }
 
        /*
@@ -514,21 +513,23 @@ int check_session_rotation_pending(struct ltt_session *session,
        }
        session_reset_rotation_state(session, LTTNG_ROTATION_STATE_COMPLETED);
 
-       location = session_get_trace_archive_location(session);
-       /* Ownership of location is transferred. */
-       ret = notification_thread_command_session_rotation_completed(
-                       notification_thread_handle,
-                       session->name,
-                       session->uid,
-                       session->gid,
-                       session->last_archived_chunk_id.value,
-                       location);
-       if (ret != LTTNG_OK) {
-               ERR("[rotation-thread] Failed to notify notification thread of completed rotation for session %s",
-                               session->name);
+       if (!session->quiet_rotation) {
+               location = session_get_trace_archive_location(session);
+               /* Ownership of location is transferred. */
+               ret = notification_thread_command_session_rotation_completed(
+                               notification_thread_handle,
+                               session->name,
+                               session->uid,
+                               session->gid,
+                               session->last_archived_chunk_id.value,
+                               location);
+               if (ret != LTTNG_OK) {
+                       ERR("[rotation-thread] Failed to notify notification thread of completed rotation for session %s",
+                                       session->name);
+               }
        }
 
-       if (!session->active) {
+       if (!session->active && !session->quiet_rotation) {
                /*
                 * A stop command was issued during the rotation, it is
                 * up to the rotation completion check to perform the
@@ -561,7 +562,7 @@ int check_session_rotation_pending(struct ltt_session *session,
        }
 
        ret = 0;
-end:
+check_ongoing_rotation:
        if (session->rotation_state == LTTNG_ROTATION_STATE_ONGOING) {
                uint64_t chunk_being_archived_id;
 
@@ -581,6 +582,7 @@ end:
                }
        }
 
+end:
        return ret;
 }
 
@@ -594,7 +596,7 @@ int launch_session_rotation(struct ltt_session *session)
        DBG("[rotation-thread] Launching scheduled time-based rotation on session \"%s\"",
                        session->name);
 
-       ret = cmd_rotate_session(session, &rotation_return);
+       ret = cmd_rotate_session(session, &rotation_return, false);
        if (ret == LTTNG_OK) {
                DBG("[rotation-thread] Scheduled time-based rotation successfully launched on session \"%s\"",
                                session->name);
@@ -741,7 +743,7 @@ int handle_condition(const struct lttng_condition *condition,
                goto end_unlock;
        }
 
-       ret = cmd_rotate_session(session, NULL);
+       ret = cmd_rotate_session(session, NULL, false);
        if (ret == -LTTNG_ERR_ROTATION_PENDING) {
                DBG("Rotate already pending, subscribe to the next threshold value");
        } else if (ret != LTTNG_OK) {
@@ -831,8 +833,7 @@ void *thread_rotation(void *data)
        int ret;
        struct rotation_thread_handle *handle = data;
        struct rotation_thread thread;
-       const int queue_pipe_fd = lttng_pipe_get_readfd(
-                       handle->rotation_timer_queue->event_pipe);
+       int queue_pipe_fd;
 
        DBG("[rotation-thread] Started rotation thread");
 
@@ -841,6 +842,9 @@ void *thread_rotation(void *data)
                goto end;
        }
 
+       queue_pipe_fd = lttng_pipe_get_readfd(
+                       handle->rotation_timer_queue->event_pipe);
+
        rcu_register_thread();
        rcu_thread_online();
 
@@ -913,7 +917,6 @@ void *thread_rotation(void *data)
                                        ret = lttng_read(fd, &buf, 1);
                                        if (ret != 1) {
                                                ERR("[rotation-thread] Failed to read from wakeup pipe (fd = %i)", fd);
-                                               ret = -1;
                                                goto error;
                                        }
                                } else {