Fix: sessiond: client/client_list lock inversion on disconnect

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

diff --git a/src/bin/lttng-sessiond/action-executor.c b/src/bin/lttng-sessiond/action-executor.c
index c51bb7f639cd7143d3301fbac8c2b385715ece11..e3b387d62d35c33e76c95f2b3745bdfde1e74156 100644 (file)
--- a/src/bin/lttng-sessiond/action-executor.c
+++ b/src/bin/lttng-sessiond/action-executor.c
@@ -143,8 +143,6 @@ static int client_handle_transmission_status(
        struct action_executor *executor = user_data;
        bool update_communication = true;
 
        struct action_executor *executor = user_data;
        bool update_communication = true;
 

-       ASSERT_LOCKED(client->lock);
-

        switch (status) {
        case CLIENT_TRANSMISSION_STATUS_COMPLETE:
                DBG("Successfully sent full notification to client, client_id = %" PRIu64,
        switch (status) {
        case CLIENT_TRANSMISSION_STATUS_COMPLETE:
                DBG("Successfully sent full notification to client, client_id = %" PRIu64,


@@ -158,12 +156,10 @@ static int client_handle_transmission_status(
        case CLIENT_TRANSMISSION_STATUS_FAIL:
                DBG("Communication error occurred while sending notification to client, client_id = %" PRIu64,
                                client->id);
        case CLIENT_TRANSMISSION_STATUS_FAIL:
                DBG("Communication error occurred while sending notification to client, client_id = %" PRIu64,
                                client->id);

-               client->communication.active = false;

                break;
        default:
                ERR("Fatal error encoutered while sending notification to client, client_id = %" PRIu64,
                                client->id);
                break;
        default:
                ERR("Fatal error encoutered while sending notification to client, client_id = %" PRIu64,
                                client->id);

-               client->communication.active = false;

                ret = -1;
                goto end;
        }
                ret = -1;
                goto end;
        }


@@ -172,6 +168,7 @@ static int client_handle_transmission_status(
                goto end;
        }
 
                goto end;
        }
 

+       /* Safe to read client's id without locking as it is immutable. */

        ret = notification_thread_client_communication_update(
                        executor->notification_thread_handle, client->id,
                        status);
        ret = notification_thread_client_communication_update(
                        executor->notification_thread_handle, client->id,
                        status);