Fix: sessiond: use of null session when session is not found

[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 fa6808005c2a9b1cb00ab47f402feac2f6834a43..5e6042e85671b88ad0b12dd5ea848b51b84529c2 100644 (file)
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -26,6 +26,7 @@
 #include <lttng/notification/channel-internal.h>
 #include <lttng/rotate-internal.h>
 #include <lttng/location-internal.h>
+#include <lttng/condition/condition-internal.h>
 
 #include "rotation-thread.h"
 #include "lttng-sessiond.h"
@@ -586,8 +587,7 @@ int handle_job_queue(struct rotation_thread_handle *handle,
                session_lock_list();
                session = job->session;
                if (!session) {
-                       DBG("[rotation-thread] Session \"%s\" not found",
-                                       session->name);
+                       DBG("[rotation-thread] Session not found");
                        /*
                         * This is a non-fatal error, and we cannot report it to
                         * the user (timer), so just print the error and
@@ -599,7 +599,6 @@ int handle_job_queue(struct rotation_thread_handle *handle,
                         * already been queued before it was destroyed.
                         */
                        free(job);
-                       session_put(session);
                        session_unlock_list();
                        continue;
                }
@@ -662,10 +661,14 @@ int handle_condition(const struct lttng_condition *condition,
        session_lock_list();
        session = session_find_by_name(condition_session_name);
        if (!session) {
-               ret = -1;
-               session_unlock_list();
-               ERR("[rotation-thread] Session \"%s\" not found",
+               DBG("[rotation-thread] Failed to find session while handling notification: session name = `%s`",
                                condition_session_name);
+               /*
+                * Not a fatal error: a session can be destroyed before we get
+                * the chance to handle the notification.
+                */
+               ret = 0;
+               session_unlock_list();
                goto end;
        }
        session_lock(session);