X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=96f7433a6345fd90b1f608a272785fe3fc341578;hb=ac16173e318279dee29504820e3c2ad8ea597712;hp=2abcdf48eb5f161e207d48288c07cfa781116b2f;hpb=58daac01d91347336f24e1fc1cacd4e7a3101e93;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 2abcdf48e..96f7433a6 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -488,8 +488,14 @@ static int list_lttng_agent_events(struct agent *agt,
 			.loglevel_type = agent_event->loglevel_type,
 		};
 
-		strncpy(event.name, agent_event->name, sizeof(event.name));
-		event.name[sizeof(event.name) - 1] = '\0';
+		ret = lttng_strncpy(event.name, agent_event->name, sizeof(event.name));
+		if (ret) {
+			/* Internal error, invalid name. */
+			ERR("Invalid event name while listing agent events: '%s' exceeds the maximal allowed length of %zu bytes",
+					agent_event->name, sizeof(event.name));
+			ret = -LTTNG_ERR_UNK;
+			goto end;
+		}
 
 		ret = lttng_dynamic_buffer_append(
 				&payload->buffer, &event, sizeof(event));
@@ -556,8 +562,14 @@ static int list_lttng_ust_global_events(char *channel_name,
 			continue;
 		}
 
-		strncpy(event.name, uevent->attr.name, sizeof(event.name));
-		event.name[sizeof(event.name) - 1] = '\0';
+		ret = lttng_strncpy(event.name, uevent->attr.name, sizeof(event.name));
+		if (ret) {
+			/* Internal error, invalid name. */
+			ERR("Invalid event name while listing user space tracer events: '%s' exceeds the maximal allowed length of %zu bytes",
+					uevent->attr.name, sizeof(event.name));
+			ret = -LTTNG_ERR_UNK;
+			goto end;
+		}
 
 		event.enabled = uevent->enabled;
 
@@ -647,8 +659,16 @@ static int list_lttng_kernel_events(char *channel_name,
 	cds_list_for_each_entry(kevent, &kchan->events_list.head , list) {
 		struct lttng_event event = {};
 
-		strncpy(event.name, kevent->event->name, sizeof(event.name));
-		event.name[sizeof(event.name) - 1] = '\0';
+		ret = lttng_strncpy(event.name, kevent->event->name, sizeof(event.name));
+		if (ret) {
+			/* Internal error, invalid name. */
+			ERR("Invalid event name while listing kernel events: '%s' exceeds the maximal allowed length of %zu bytes",
+					kevent->event->name,
+					sizeof(event.name));
+			ret = -LTTNG_ERR_UNK;
+			goto end;
+		}
+
 		event.enabled = kevent->enabled;
 		event.filter = (unsigned char) !!kevent->filter_expression;
 
@@ -4295,8 +4315,7 @@ int cmd_register_trigger(struct command_ctx *cmd_ctx, int sock,
 			sock, trigger_payload.buffer.data, trigger_len);
 	if (sock_recv_len < 0 || sock_recv_len != trigger_len) {
 		ERR("Failed to receive \"register trigger\" command payload");
-		/* TODO: should this be a new error enum ? */
-		ret = LTTNG_ERR_INVALID_TRIGGER;
+		ret = LTTNG_ERR_INVALID_PROTOCOL;
 		goto end;
 	}