X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=bdc27475eeaf3c89552ca3cd507ff8b5235c96c8;hb=be65f8024c1c7e9bee1a53c118233295a7861ce7;hp=10ce291978227acf5d5e35eb5e623cbba80b82fb;hpb=f118099a14a45245993eedfe31cb36b3fd948d33;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 10ce29197..bdc27475e 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -520,7 +520,7 @@ static int set_options(int argc, char **argv)
 	int c, ret = 0, option_index = 0, retval = 0;
 	int orig_optopt = optopt, orig_optind = optind;
 	char *default_address, *optstring;
-	const char *config_path = NULL;
+	char *config_path = NULL;
 
 	optstring = utils_generate_optstring(long_options,
 			sizeof(long_options) / sizeof(struct option));
@@ -544,6 +544,7 @@ static int set_options(int argc, char **argv)
 			WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
 				"-f, --config");
 		} else {
+			free(config_path);
 			config_path = utils_expand_path(optarg);
 			if (!config_path) {
 				ERR("Failed to resolve path: %s", optarg);
@@ -656,6 +657,7 @@ static int set_options(int argc, char **argv)
 	}
 
 exit:
+	free(config_path);
 	free(optstring);
 	return retval;
 }
@@ -1961,7 +1963,7 @@ static int relay_recv_metadata(const struct lttcomm_relayd_hdr *recv_hdr,
 
 	packet_view = lttng_buffer_view_from_view(payload,
 			sizeof(metadata_payload_header), metadata_payload_size);
-	if (!packet_view.data) {
+	if (!lttng_buffer_view_is_valid(&packet_view)) {
 		ERR("Invalid metadata packet length announced by header");
 		ret = -1;
 		goto end_put;
@@ -2667,7 +2669,6 @@ static int relay_create_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 	struct lttcomm_relayd_create_trace_chunk *msg;
 	struct lttcomm_relayd_generic_reply reply = {};
 	struct lttng_buffer_view header_view;
-	struct lttng_buffer_view chunk_name_view;
 	struct lttng_trace_chunk *chunk = NULL, *published_chunk = NULL;
 	enum lttng_error_code reply_code = LTTNG_OK;
 	enum lttng_trace_chunk_status chunk_status;
@@ -2686,7 +2687,7 @@ static int relay_create_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 	}
 
 	header_view = lttng_buffer_view_from_view(payload, 0, sizeof(*msg));
-	if (!header_view.data) {
+	if (!lttng_buffer_view_is_valid(&header_view)) {
 		ERR("Failed to receive payload of chunk creation command");
 		ret = -1;
 		goto end_no_reply;
@@ -2731,13 +2732,21 @@ static int relay_create_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 
 	if (msg->override_name_length) {
 		const char *name;
+		const struct lttng_buffer_view chunk_name_view =
+				lttng_buffer_view_from_view(payload,
+						sizeof(*msg),
+						msg->override_name_length);
+
+		if (!lttng_buffer_view_is_valid(&chunk_name_view)) {
+			ERR("Invalid payload of chunk creation command (protocol error): buffer too short for expected name length");
+			ret = -1;
+			reply_code = LTTNG_ERR_INVALID;
+			goto end;
+		}
 
-		chunk_name_view = lttng_buffer_view_from_view(payload,
-				sizeof(*msg),
-				msg->override_name_length);
 		name = chunk_name_view.data;
-		if (!name || name[msg->override_name_length - 1]) {
-			ERR("Failed to receive payload of chunk creation command");
+		if (name[msg->override_name_length - 1]) {
+			ERR("Invalid payload of chunk creation command (protocol error): name is not null-terminated");
 			ret = -1;
 			reply_code = LTTNG_ERR_INVALID;
 			goto end;
@@ -2872,7 +2881,7 @@ static int relay_close_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 	}
 
 	header_view = lttng_buffer_view_from_view(payload, 0, sizeof(*msg));
-	if (!header_view.data) {
+	if (!lttng_buffer_view_is_valid(&header_view)) {
 		ERR("Failed to receive payload of chunk close command");
 		ret = -1;
 		goto end_no_reply;
@@ -3105,20 +3114,20 @@ static int relay_trace_chunk_exists(const struct lttcomm_relayd_hdr *recv_hdr,
 	bool chunk_exists;
 
 	if (!session || !conn->version_check_done) {
-		ERR("Trying to close a trace chunk before version check");
+		ERR("Trying to check for the existance of a trace chunk before version check");
 		ret = -1;
 		goto end_no_reply;
 	}
 
 	if (session->major == 2 && session->minor < 11) {
-		ERR("Chunk close command is unsupported before 2.11");
+		ERR("Chunk exists command is unsupported before 2.11");
 		ret = -1;
 		goto end_no_reply;
 	}
 
 	header_view = lttng_buffer_view_from_view(payload, 0, sizeof(*msg));
-	if (!header_view.data) {
-		ERR("Failed to receive payload of chunk close command");
+	if (!lttng_buffer_view_is_valid(&header_view)) {
+		ERR("Failed to receive payload of chunk exists command");
 		ret = -1;
 		goto end_no_reply;
 	}
@@ -3169,7 +3178,7 @@ static int relay_get_configuration(const struct lttcomm_relayd_hdr *recv_hdr,
 	uint64_t result_flags = 0;
 
 	header_view = lttng_buffer_view_from_view(payload, 0, sizeof(*msg));
-	if (!header_view.data) {
+	if (!lttng_buffer_view_is_valid(&header_view)) {
 		ERR("Failed to receive payload of chunk close command");
 		ret = -1;
 		goto end_no_reply;