.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));
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;
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;
&payload,
0,
cmd_ctx->lsm.u.create_session.home_dir_size);
+ if (cmd_ctx->lsm.u.create_session.home_dir_size > 0 &&
+ !lttng_buffer_view_is_valid(&home_dir_view)) {
+ ERR("Invalid payload in \"create session\" command: buffer too short to contain home directory");
+ ret_code = LTTNG_ERR_INVALID_PROTOCOL;
+ goto error;
+ }
+
session_descriptor_view = lttng_buffer_view_from_dynamic_buffer(
&payload,
cmd_ctx->lsm.u.create_session.home_dir_size,
cmd_ctx->lsm.u.create_session.session_descriptor_size);
+ if (!lttng_buffer_view_is_valid(&session_descriptor_view)) {
+ ERR("Invalid payload in \"create session\" command: buffer too short to contain session descriptor");
+ ret_code = LTTNG_ERR_INVALID_PROTOCOL;
+ goto error;
+ }
ret = lttng_session_descriptor_create_from_buffer(
&session_descriptor_view, &session_descriptor);
return ret;
}
-int cmd_register_trigger(struct command_ctx *cmd_ctx, int sock,
- struct notification_thread_handle *notification_thread)
+int cmd_register_trigger(const struct lttng_credentials *cmd_creds,
+ struct lttng_trigger *trigger,
+ struct notification_thread_handle *notification_thread,
+ struct lttng_trigger **return_trigger)
{
int ret;
- size_t trigger_len;
- ssize_t sock_recv_len;
- struct lttng_trigger *trigger = NULL;
- struct lttng_payload trigger_payload;
- struct lttng_credentials cmd_creds = {
- .uid = LTTNG_OPTIONAL_INIT_VALUE(cmd_ctx->creds.uid),
- .gid = LTTNG_OPTIONAL_INIT_VALUE(cmd_ctx->creds.gid),
- };
-
- lttng_payload_init(&trigger_payload);
- trigger_len = (size_t) cmd_ctx->lsm.u.trigger.length;
- ret = lttng_dynamic_buffer_set_size(
- &trigger_payload.buffer, trigger_len);
- if (ret) {
- ret = LTTNG_ERR_NOMEM;
- goto end;
- }
-
- sock_recv_len = lttcomm_recv_unix_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;
- goto end;
- }
-
- /* Receive fds, if any. */
- if (cmd_ctx->lsm.fd_count > 0) {
- ret = lttcomm_recv_payload_fds_unix_sock(
- sock, cmd_ctx->lsm.fd_count, &trigger_payload);
- if (ret > 0 && ret != cmd_ctx->lsm.fd_count * sizeof(int)) {
- ret = LTTNG_ERR_INVALID_PROTOCOL;
- goto end;
- } else if (ret <= 0) {
- ret = LTTNG_ERR_FATAL;
- goto end;
- }
- }
-
- /* Deserialize trigger. */
- {
- struct lttng_payload_view view =
- lttng_payload_view_from_payload(
- &trigger_payload, 0, -1);
-
- if (lttng_trigger_create_from_payload(&view, &trigger) !=
- trigger_len) {
- ERR("Invalid trigger payload received in \"register trigger\" command");
- ret = LTTNG_ERR_INVALID_TRIGGER;
- goto end;
- }
- }
-
/*
* Validate the trigger credentials against the command credentials.
*/
if (!lttng_credentials_is_equal_uid(
lttng_trigger_get_credentials(trigger),
- &cmd_creds)) {
- if (lttng_credentials_get_uid(&cmd_creds) != 0) {
+ cmd_creds)) {
+ if (lttng_credentials_get_uid(cmd_creds) != 0) {
ERR("Trigger credentials do not match the command credentials");
ret = LTTNG_ERR_INVALID_TRIGGER;
goto end;
}
}
- /* Inform the notification thread */
+ /*
+ * The bytecode generation also serves as a validation step for the
+ * bytecode expressions.
+ */
+ ret = lttng_trigger_generate_bytecode(trigger, cmd_creds);
+ if (ret != LTTNG_OK) {
+ goto end;
+ }
+
+ /*
+ * A reference to the trigger is acquired by the notification thread.
+ * It is safe to return the same trigger to the caller since it the
+ * other user holds a reference.
+ *
+ * The trigger is modified during the execution of the
+ * "register trigger" command. However, by the time the command returns,
+ * it is safe to use without any locking as its properties are
+ * immutable.
+ */
ret = notification_thread_command_register_trigger(notification_thread,
trigger);
+ if (ret != LTTNG_OK) {
+ goto end_notification_thread;
+ }
+
+ /*
+ * Return an updated trigger to the client.
+ *
+ * Since a modified version of the same trigger is returned, acquire a
+ * reference to the trigger so the caller doesn't have to care if those
+ * are distinct instances or not.
+ */
+ lttng_trigger_get(trigger);
+ *return_trigger = trigger;
+
+end_notification_thread:
/* Ownership of trigger was transferred. */
trigger = NULL;
end:
- lttng_trigger_destroy(trigger);
- lttng_payload_reset(&trigger_payload);
return ret;
}
-int cmd_unregister_trigger(struct command_ctx *cmd_ctx, int sock,
+int cmd_unregister_trigger(const struct lttng_credentials *cmd_creds,
+ const struct lttng_trigger *trigger,
struct notification_thread_handle *notification_thread)
{
int ret;
- size_t trigger_len;
- ssize_t sock_recv_len;
- struct lttng_trigger *trigger = NULL;
- struct lttng_payload trigger_payload;
- struct lttng_credentials cmd_creds = {
- .uid = LTTNG_OPTIONAL_INIT_VALUE(cmd_ctx->creds.uid),
- .gid = LTTNG_OPTIONAL_INIT_VALUE(cmd_ctx->creds.gid),
- };
-
- lttng_payload_init(&trigger_payload);
- trigger_len = (size_t) cmd_ctx->lsm.u.trigger.length;
- ret = lttng_dynamic_buffer_set_size(
- &trigger_payload.buffer, trigger_len);
- if (ret) {
- ret = LTTNG_ERR_NOMEM;
- goto end;
- }
-
- sock_recv_len = lttcomm_recv_unix_sock(
- sock, trigger_payload.buffer.data, trigger_len);
- if (sock_recv_len < 0 || sock_recv_len != trigger_len) {
- ERR("Failed to receive \"unregister trigger\" command payload");
- /* TODO: should this be a new error enum ? */
- ret = LTTNG_ERR_INVALID_TRIGGER;
- goto end;
- }
-
- /* Receive fds, if any. */
- if (cmd_ctx->lsm.fd_count > 0) {
- ret = lttcomm_recv_payload_fds_unix_sock(
- sock, cmd_ctx->lsm.fd_count, &trigger_payload);
- if (ret > 0 && ret != cmd_ctx->lsm.fd_count * sizeof(int)) {
- ret = LTTNG_ERR_INVALID_PROTOCOL;
- goto end;
- } else if (ret <= 0) {
- ret = LTTNG_ERR_FATAL;
- goto end;
- }
- }
-
- {
- struct lttng_payload_view view =
- lttng_payload_view_from_payload(
- &trigger_payload, 0, -1);
-
- if (lttng_trigger_create_from_payload(&view, &trigger) !=
- trigger_len) {
- ERR("Invalid trigger payload received in \"unregister trigger\" command");
- ret = LTTNG_ERR_INVALID_TRIGGER;
- goto end;
- }
- }
/*
* Validate the trigger credentials against the command credentials.
*/
if (!lttng_credentials_is_equal_uid(
lttng_trigger_get_credentials(trigger),
- &cmd_creds)) {
- if (lttng_credentials_get_uid(&cmd_creds) != 0) {
+ cmd_creds)) {
+ if (lttng_credentials_get_uid(cmd_creds) != 0) {
ERR("Trigger credentials do not match the command credentials");
ret = LTTNG_ERR_INVALID_TRIGGER;
goto end;
ret = notification_thread_command_unregister_trigger(notification_thread,
trigger);
end:
- lttng_trigger_destroy(trigger);
- lttng_payload_reset(&trigger_payload);
return ret;
}
+int cmd_list_triggers(struct command_ctx *cmd_ctx,
+ struct notification_thread_handle *notification_thread,
+ struct lttng_triggers **return_triggers)
+{
+ int ret = 0;
+ enum lttng_error_code ret_code;
+ struct lttng_triggers *triggers = NULL;
+
+ /* Get the set of triggers from the notification thread. */
+ ret_code = notification_thread_command_list_triggers(
+ notification_thread, cmd_ctx->creds.uid, &triggers);
+ if (ret_code != LTTNG_OK) {
+ ret = ret_code;
+ goto end;
+ }
+
+ *return_triggers = triggers;
+ triggers = NULL;
+ ret = LTTNG_OK;
+end:
+ lttng_triggers_destroy(triggers);
+ return ret;
+}
/*
* Send relayd sockets from snapshot output to consumer. Ignore request if the
* snapshot output is *not* set with a remote destination.