Fix: agent port file is o+w when launching as root

[lttng-tools.git] / src / bin / lttng-sessiond / client.c

diff --git a/src/bin/lttng-sessiond/client.c b/src/bin/lttng-sessiond/client.c
index 0bf8266f4f7a0912018661a4ea794c7e82d8df90..a3d508a7018d5df82c0f0157ec7ba43fd1b5479a 100644 (file)
--- a/src/bin/lttng-sessiond/client.c
+++ b/src/bin/lttng-sessiond/client.c
@@ -767,6 +767,10 @@ static enum lttng_error_code receive_lttng_event(struct command_ctx *cmd_ctx,
        ssize_t sock_recv_len;
        enum lttng_error_code ret_code;
        struct lttng_payload event_payload;
+       struct lttng_event *local_event = NULL;
+       char *local_filter_expression = NULL;
+       struct lttng_bytecode *local_bytecode = NULL;
+       struct lttng_event_exclusion *local_exclusion = NULL;
 
        lttng_payload_init(&event_payload);
        if (cmd_ctx->lsm.cmd_type == LTTNG_ENABLE_EVENT) {
@@ -814,23 +818,45 @@ static enum lttng_error_code receive_lttng_event(struct command_ctx *cmd_ctx,
 
        /* Deserialize event. */
        {
+               ssize_t len;
                struct lttng_payload_view event_view =
                                lttng_payload_view_from_payload(
                                                &event_payload, 0, -1);
 
-               if (lttng_event_create_from_payload(&event_view, out_event,
-                                   out_exclusion, out_filter_expression,
-                                   out_bytecode) != event_len) {
-                       ERR("Invalid event received as part of command payload");
+               len = lttng_event_create_from_payload(&event_view, &local_event,
+                                   &local_exclusion, &local_filter_expression,
+                                   &local_bytecode);
+
+               if (len < 0) {
+                       ERR("Failed to create an event from the received buffer");
+                       ret_code = LTTNG_ERR_INVALID_PROTOCOL;
+                       goto end;
+               }
+
+               if (len != event_len) {
+                       ERR("Userspace probe location from the received buffer is not the advertised length: header length = %zu" PRIu32 ", payload length = %zd", event_len, len);
                        ret_code = LTTNG_ERR_INVALID_PROTOCOL;
                        goto end;
                }
        }
 
+       *out_event = local_event;
+       *out_exclusion = local_exclusion;
+       *out_filter_expression = local_filter_expression;
+       *out_bytecode = local_bytecode;
+       local_event = NULL;
+       local_exclusion = NULL;
+       local_filter_expression = NULL;
+       local_bytecode = NULL;
+
        ret_code = LTTNG_OK;
 
 end:
        lttng_payload_reset(&event_payload);
+       lttng_event_destroy(local_event);
+       free(local_filter_expression);
+       free(local_bytecode);
+       free(local_exclusion);
        return ret_code;
 }
 
@@ -846,6 +872,7 @@ static enum lttng_error_code receive_lttng_event_context(
        ssize_t sock_recv_len;
        enum lttng_error_code ret_code;
        struct lttng_payload event_context_payload;
+       struct lttng_event_context *context = NULL;
 
        lttng_payload_init(&event_context_payload);
 
@@ -868,22 +895,33 @@ static enum lttng_error_code receive_lttng_event_context(
 
        /* Deserialize event. */
        {
+               ssize_t len;
                struct lttng_payload_view event_context_view =
                                lttng_payload_view_from_payload(
                                                &event_context_payload, 0, -1);
 
-               if (lttng_event_context_create_from_payload(
-                               &event_context_view, out_event_context) !=
-                               event_context_len) {
-                       ERR("Invalid event context received as part of command payload");
+               len = lttng_event_context_create_from_payload(
+                               &event_context_view, &context);
+
+               if (len < 0) {
+                       ERR("Failed to create a event context from the received buffer");
+                       ret_code = LTTNG_ERR_INVALID_PROTOCOL;
+                       goto end;
+               }
+
+               if (len != event_context_len) {
+                       ERR("Event context from the received buffer is not the advertised length: expected length = %zu, payload length = %zd", event_context_len, len);
                        ret_code = LTTNG_ERR_INVALID_PROTOCOL;
                        goto end;
                }
        }
 
+       *out_event_context = context;
+       context = NULL;
        ret_code = LTTNG_OK;
 
 end:
+       lttng_event_context_destroy(context);
        lttng_payload_reset(&event_context_payload);
        return ret_code;
 }
@@ -1361,7 +1399,7 @@ skip_domain:
        switch (cmd_ctx->lsm.cmd_type) {
        case LTTNG_ADD_CONTEXT:
        {
-               struct lttng_event_context *event_context;
+               struct lttng_event_context *event_context = NULL;
                const enum lttng_error_code ret_code =
                        receive_lttng_event_context(
                                cmd_ctx, *sock, sock_error, &event_context);
@@ -2357,7 +2395,6 @@ init_setup_error:
 static int create_client_sock(void)
 {
        int ret, client_sock;
-       const mode_t old_umask = umask(0);
 
        /* Create client tool unix socket */
        client_sock = lttcomm_create_unix_sock(
@@ -2391,7 +2428,6 @@ static int create_client_sock(void)
        DBG("Created client socket (fd = %i)", client_sock);
        ret = client_sock;
 end:
-       umask(old_umask);
        return ret;
 }