Cleanup: send_fds functions are not const-correct

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

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index f89bb1df290fbc8d5f6682e1f1089448974ca40e..4a19c93475802af9e4e5f98a37325b1db207a7c4 100644 (file)
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -735,7 +735,8 @@ error:
  *
  * The consumer socket lock must be held by the caller.
  */
-int consumer_send_fds(struct consumer_socket *sock, int *fds, size_t nb_fd)
+int consumer_send_fds(struct consumer_socket *sock, const int *fds,
+               size_t nb_fd)
 {
        int ret;
 
@@ -973,7 +974,7 @@ void consumer_init_streams_sent_comm_msg(struct lttcomm_consumer_msg *msg,
  */
 int consumer_send_stream(struct consumer_socket *sock,
                struct consumer_output *dst, struct lttcomm_consumer_msg *msg,
-               int *fds, size_t nb_fd)
+               const int *fds, size_t nb_fd)
 {
        int ret;
 
@@ -1460,6 +1461,16 @@ int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
                if (ret < 0) {
                        ret = -LTTNG_ERR_NOMEM;
                        goto error;
+               } else if (ret >= sizeof(msg.u.snapshot_channel.pathname)) {
+                       ERR("Snapshot path exceeds the maximal allowed length of %zu bytes (%i bytes required) with path \"%s/%s/%s-%s-%" PRIu64 "%s\"",
+                                       sizeof(msg.u.snapshot_channel.pathname),
+                                       ret, output->consumer->dst.net.base_dir,
+                                       output->consumer->subdir,
+                                       output->name, output->datetime,
+                                       output->nb_snapshot,
+                                       session_path);
+                       ret = -LTTNG_ERR_SNAPSHOT_FAIL;
+                       goto error;
                }
        } else {
                ret = snprintf(msg.u.snapshot_channel.pathname,
@@ -1472,7 +1483,16 @@ int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
                if (ret < 0) {
                        ret = -LTTNG_ERR_NOMEM;
                        goto error;
+               } else if (ret >= sizeof(msg.u.snapshot_channel.pathname)) {
+                       ERR("Snapshot path exceeds the maximal allowed length of %zu bytes (%i bytes required) with path \"%s/%s-%s-%" PRIu64 "%s\"",
+                                       sizeof(msg.u.snapshot_channel.pathname),
+                                       ret, output->consumer->dst.session_root_path,
+                                       output->name, output->datetime, output->nb_snapshot,
+                                       session_path);
+                       ret = -LTTNG_ERR_SNAPSHOT_FAIL;
+                       goto error;
                }
+
                msg.u.snapshot_channel.relayd_id = (uint64_t) -1ULL;
 
                /* Create directory. Ignore if exist. */
@@ -1752,7 +1772,7 @@ int consumer_rotate_pending_relay(struct consumer_socket *socket,
 
        assert(socket);
 
-       DBG("Consumer rotate pending on relay for session %" PRIu64 ", chunk id % " PRIu64,
+       DBG("Consumer rotate pending on relay for session %" PRIu64 ", chunk id %" PRIu64,
                        session_id, chunk_id);
        assert(output->type == CONSUMER_DST_NET);