X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fcmd-2-2.c;h=915b2eb64a41a84acca565cf8b5135bf786d770b;hp=f82166cf3c14b9d62fe5c0c03a2057f2d7fef890;hb=9c256b0146b021962e93fda7400c61ceb2b0d45f;hpb=7591bab11eceedc6a0d1e02fd6f85592267a63b5

diff --git a/src/bin/lttng-relayd/cmd-2-2.c b/src/bin/lttng-relayd/cmd-2-2.c
index f82166cf3..915b2eb64 100644
--- a/src/bin/lttng-relayd/cmd-2-2.c
+++ b/src/bin/lttng-relayd/cmd-2-2.c
@@ -17,24 +17,23 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <assert.h>
-#include <string.h>
 
 #include <common/common.h>
 #include <common/sessiond-comm/relayd.h>
 
 #include <common/compat/endian.h>
+#include <common/compat/string.h>
+#include <lttng/constant.h>
 
-#include "cmd-generic.h"
 #include "cmd-2-1.h"
 #include "utils.h"
 
 /*
  * cmd_recv_stream_2_2 allocates path_name and channel_name.
  */
-int cmd_recv_stream_2_2(struct relay_connection *conn,
+int cmd_recv_stream_2_2(const struct lttng_buffer_view *payload,
 		char **ret_path_name, char **ret_channel_name,
 		uint64_t *tracefile_size, uint64_t *tracefile_count)
 {
@@ -42,24 +41,39 @@ int cmd_recv_stream_2_2(struct relay_connection *conn,
 	struct lttcomm_relayd_add_stream_2_2 stream_info;
 	char *path_name = NULL;
 	char *channel_name = NULL;
+	size_t len;
 
-	ret = cmd_recv(conn->sock, &stream_info, sizeof(stream_info));
-	if (ret < 0) {
-		ERR("Unable to recv stream version 2.2");
+	if (payload->size < sizeof(stream_info)) {
+		ERR("Unexpected payload size in \"cmd_recv_stream_2_2\": expected >= %zu bytes, got %zu bytes",
+				sizeof(stream_info), payload->size);
+		ret = -1;
 		goto error;
 	}
+	memcpy(&stream_info, payload->data, sizeof(stream_info));
 
-	path_name = create_output_path(stream_info.pathname);
+	len = lttng_strnlen(stream_info.pathname, sizeof(stream_info.pathname));
+	/* Ensure that NULL-terminated and fits in local filename length. */
+	if (len == sizeof(stream_info.pathname) || len >= LTTNG_NAME_MAX) {
+		ret = -ENAMETOOLONG;
+		ERR("Path name too long");
+		goto error;
+	}
+	path_name = strdup(stream_info.pathname);
 	if (!path_name) {
 		PERROR("Path name allocation");
 		ret = -ENOMEM;
 		goto error;
 	}
-
+	len = lttng_strnlen(stream_info.channel_name, sizeof(stream_info.channel_name));
+	if (len == sizeof(stream_info.channel_name) || len >= DEFAULT_STREAM_NAME_LEN) {
+		ret = -ENAMETOOLONG;
+		ERR("Channel name too long");
+		goto error;
+	}
 	channel_name = strdup(stream_info.channel_name);
 	if (!channel_name) {
 		ret = -errno;
-		PERROR("Path name allocation");
+		PERROR("Channel name allocation");
 		goto error;
 	}