Fix: send_channel_monitor_pipe does not take the consumer socket lock

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index 5e723e9b3804e08335d3e16758486899ec79f83e..25194460645d377ad5d0680417629f1f69d2f40b 100644 (file)
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -1068,6 +1068,7 @@ int consumer_send_channel_monitor_pipe(struct consumer_socket *consumer_sock,
        memset(&msg, 0, sizeof(msg));
        msg.cmd_type = LTTNG_CONSUMER_SET_CHANNEL_MONITOR_PIPE;
 
+       pthread_mutex_lock(consumer_sock->lock);
        DBG3("Sending set_channel_monitor_pipe command to consumer");
        ret = consumer_send_msg(consumer_sock, &msg);
        if (ret < 0) {
@@ -1083,6 +1084,7 @@ int consumer_send_channel_monitor_pipe(struct consumer_socket *consumer_sock,
 
        DBG2("Channel monitoring pipe successfully sent");
 error:
+       pthread_mutex_unlock(consumer_sock->lock);
        return ret;
 }
 

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index ea28feecfd0888d644edce7bf4ff70fbe36c0730..30f3b714e33454400d5171f48f43bb35f43feeca 100644 (file)
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -1270,6 +1270,7 @@ restart:
        if (!cmd_socket_wrapper) {
                goto error;
        }
+       cmd_socket_wrapper->lock = &consumer_data->lock;
 
        ret = consumer_send_channel_monitor_pipe(cmd_socket_wrapper,
                        consumer_data->channel_monitor_pipe);