Fix: fail on truncation of snapshot path
authorJérémie Galarneau <jeremie.galarneau@efficios.com>
Wed, 28 Feb 2018 21:26:11 +0000 (16:26 -0500)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Tue, 3 Apr 2018 16:12:29 +0000 (12:12 -0400)
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
src/bin/lttng-sessiond/consumer.c

index 5906cdca5901358fd339cf24f6de366eb99d7369..44dc35d6b92e3fafd412e35fb95b838f986bb016 100644 (file)
@@ -1460,6 +1460,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 +1482,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. */
This page took 0.035002 seconds and 4 git commands to generate.