X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fclient.c;h=ecd31ea48b11159d56b3f350f15d58b40eb19114;hp=74bbbe9b2e05e3be7f94a1cba1330aae6d7658ba;hb=3e6e0df2f8f9f23d252c2508b6d741916dfcc4b3;hpb=e368fb4396b9bdb22de16f0c93512c9f6d7ab0b4 diff --git a/src/bin/lttng-sessiond/client.c b/src/bin/lttng-sessiond/client.c index 74bbbe9b2..ecd31ea48 100644 --- a/src/bin/lttng-sessiond/client.c +++ b/src/bin/lttng-sessiond/client.c @@ -13,6 +13,7 @@ #include "common/dynamic-array.h" #include "common/payload.h" #include "common/payload-view.h" +#include "common/fd-handle.h" #include "common/sessiond-comm/sessiond-comm.h" #include "common/payload.h" #include "common/payload-view.h" @@ -30,6 +31,7 @@ #include #include #include +#include #include "client.h" #include "lttng-sessiond.h" @@ -91,8 +93,12 @@ static int setup_lttng_msg(struct command_ctx *cmd_ctx, .data_size = payload_len, }; - lttng_dynamic_buffer_set_size(&cmd_ctx->reply_payload.buffer, 0); - lttng_dynamic_array_clear(&cmd_ctx->reply_payload._fds); + ret = lttng_dynamic_buffer_set_size(&cmd_ctx->reply_payload.buffer, 0); + if (ret) { + goto end; + } + + lttng_dynamic_pointer_array_clear(&cmd_ctx->reply_payload._fd_handles); cmd_ctx->lttng_msg_size = total_msg_size; @@ -132,7 +138,10 @@ static int setup_empty_lttng_msg(struct command_ctx *cmd_ctx) int ret; const struct lttcomm_lttng_msg llm = {}; - lttng_dynamic_buffer_set_size(&cmd_ctx->reply_payload.buffer, 0); + ret = lttng_dynamic_buffer_set_size(&cmd_ctx->reply_payload.buffer, 0); + if (ret) { + goto end; + } /* Append place-holder reply header. */ ret = lttng_dynamic_buffer_append( @@ -571,15 +580,14 @@ static unsigned int lttng_sessions_count(uid_t uid, gid_t gid) struct ltt_session *session; const struct ltt_session_list *session_list = session_get_list(); - DBG("Counting number of available session for UID %d GID %d", - uid, gid); + DBG("Counting number of available session for UID %d", uid); cds_list_for_each_entry(session, &session_list->head, list) { if (!session_get(session)) { continue; } session_lock(session); /* Only count the sessions the user can control. */ - if (session_access_ok(session, uid, gid) && + if (session_access_ok(session, uid) && !session->destroyed) { i++; } @@ -592,9 +600,10 @@ static unsigned int lttng_sessions_count(uid_t uid, gid_t gid) static int receive_userspace_probe(struct command_ctx *cmd_ctx, int sock, int *sock_error, struct lttng_event *event) { - int fd, ret; + int fd = -1, ret; struct lttng_userspace_probe_location *probe_location; struct lttng_payload probe_location_payload; + struct fd_handle *handle = NULL; /* * Create a payload to store the serialized version of the probe @@ -633,13 +642,25 @@ static int receive_userspace_probe(struct command_ctx *cmd_ctx, int sock, goto error; } - ret = lttng_payload_push_fd(&probe_location_payload, fd); + handle = fd_handle_create(fd); + if (!handle) { + ret = LTTNG_ERR_NOMEM; + goto error; + } + + /* Transferred to the handle. */ + fd = -1; + + ret = lttng_payload_push_fd_handle(&probe_location_payload, handle); if (ret) { ERR("Failed to add userspace probe file descriptor to payload"); ret = LTTNG_ERR_NOMEM; goto error; } + fd_handle_put(handle); + handle = NULL; + { struct lttng_payload_view view = lttng_payload_view_from_payload( &probe_location_payload, 0, -1); @@ -662,6 +683,13 @@ static int receive_userspace_probe(struct command_ctx *cmd_ctx, int sock, } error: + if (fd >= 0) { + if (close(fd)) { + PERROR("Failed to close userspace probe location binary fd"); + } + } + + fd_handle_put(handle); lttng_payload_reset(&probe_location_payload); return ret; } @@ -699,6 +727,7 @@ static int check_rotate_compatible(void) static int send_unix_sock(int sock, struct lttng_payload_view *view) { int ret; + const int fd_count = lttng_payload_view_get_fd_handle_count(view); /* Check valid length */ if (view->buffer.size == 0) { @@ -712,10 +741,11 @@ static int send_unix_sock(int sock, struct lttng_payload_view *view) goto end; } - if (lttng_dynamic_array_get_count(&view->_fds) > 0) { - ret = lttcomm_send_fds_unix_sock(sock, - (const int *) view->_fds.buffer.data, - lttng_dynamic_array_get_count(&view->_fds)); + if (fd_count > 0) { + ret = lttcomm_send_payload_view_fds_unix_sock(sock, view); + if (ret < 0) { + goto end; + } } end: @@ -1076,13 +1106,12 @@ skip_domain: } /* - * Check that the UID or GID match that of the tracing session. + * Check that the UID matches that of the tracing session. * The root user can interact with all sessions. */ if (need_tracing_session) { if (!session_access_ok(cmd_ctx->session, - LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds), - LTTNG_SOCK_GET_GID_CRED(&cmd_ctx->creds)) || + LTTNG_SOCK_GET_UID_CRED(&cmd_ctx->creds)) || cmd_ctx->session->destroyed) { ret = LTTNG_ERR_EPERM; goto error; @@ -1253,9 +1282,17 @@ error_add_context: .value_type; struct process_attr_value *value; enum lttng_error_code ret_code; + long login_name_max; + + login_name_max = sysconf(_SC_LOGIN_NAME_MAX); + if (login_name_max < 0) { + PERROR("Failed to get _SC_LOGIN_NAME_MAX system configuration"); + ret = LTTNG_ERR_INVALID; + goto error; + } /* Receive remaining variable length payload if applicable. */ - if (name_len > LOGIN_NAME_MAX) { + if (name_len > login_name_max) { /* * POSIX mandates user and group names that are at least * 8 characters long. Note that although shadow-utils @@ -1263,9 +1300,9 @@ error_add_context: * limit (from bits/utmp.h, UT_NAMESIZE), * LOGIN_NAME_MAX is defined to 256. */ - ERR("Rejecting process attribute tracker value %s as the provided exceeds the maximal allowed length: argument length = %zu, maximal length = %d", + ERR("Rejecting process attribute tracker value %s as the provided exceeds the maximal allowed length: argument length = %zu, maximal length = %ld", add_value ? "addition" : "removal", - name_len, LOGIN_NAME_MAX); + name_len, login_name_max); ret = LTTNG_ERR_INVALID; goto error; } @@ -1297,6 +1334,11 @@ error_add_context: payload_view = lttng_buffer_view_from_dynamic_buffer( &payload, 0, name_len); + if (name_len > 0 && !lttng_buffer_view_is_valid(&payload_view)) { + ret = LTTNG_ERR_INVALID_PROTOCOL; + goto error_add_remove_tracker_value; + } + /* * Validate the value type and domains are legal for the process * attribute tracker that is specified and convert the value to @@ -1996,8 +2038,41 @@ error_add_context: } case LTTNG_REGISTER_TRIGGER: { + struct lttng_trigger *return_trigger; + size_t original_payload_size; + size_t payload_size; + + ret = setup_empty_lttng_msg(cmd_ctx); + if (ret) { + ret = LTTNG_ERR_NOMEM; + goto setup_error; + } + + original_payload_size = cmd_ctx->reply_payload.buffer.size; + ret = cmd_register_trigger(cmd_ctx, *sock, - notification_thread_handle); + notification_thread_handle, &return_trigger); + if (ret != LTTNG_OK) { + goto error; + } + + ret = lttng_trigger_serialize(return_trigger, &cmd_ctx->reply_payload); + if (ret) { + ERR("Failed to serialize trigger in reply to \"register trigger\" command"); + ret = LTTNG_ERR_NOMEM; + lttng_trigger_destroy(return_trigger); + goto error; + } + + lttng_trigger_destroy(return_trigger); + return_trigger = NULL; + + payload_size = cmd_ctx->reply_payload.buffer.size - + original_payload_size; + + update_lttng_msg(cmd_ctx, 0, payload_size); + + ret = LTTNG_OK; break; } case LTTNG_UNREGISTER_TRIGGER: @@ -2266,8 +2341,7 @@ static void *thread_manage_clients(void *data) .gid = UINT32_MAX, }; cmd_ctx.session = NULL; - lttng_dynamic_buffer_set_size(&cmd_ctx.reply_payload.buffer, 0); - lttng_dynamic_array_clear(&cmd_ctx.reply_payload._fds); + lttng_payload_clear(&cmd_ctx.reply_payload); cmd_ctx.lttng_msg_size = 0; DBG("Accepting client command ..."); @@ -2410,7 +2484,7 @@ static void *thread_manage_clients(void *data) sizeof(llm)); assert(cmd_ctx.lttng_msg_size == cmd_ctx.reply_payload.buffer.size); - llm->fd_count = lttng_payload_view_get_fd_count(&view); + llm->fd_count = lttng_payload_view_get_fd_handle_count(&view); DBG("Sending response (size: %d, retcode: %s (%d))", cmd_ctx.lttng_msg_size,