X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fclient.cpp;h=4c1f6954b952ae1c4d553c5e52a71d48569ffc79;hb=f46376a14da2eb796690cb4e718e8b213839d6ea;hp=69a6497ee326d48bd64012e60697dbfb1fcbff90;hpb=129d59f5a8860d15bef3ed5a59c88e13912a5367;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/client.cpp b/src/bin/lttng-sessiond/client.cpp
index 69a6497ee..4c1f6954b 100644
--- a/src/bin/lttng-sessiond/client.cpp
+++ b/src/bin/lttng-sessiond/client.cpp
@@ -583,7 +583,8 @@ error_create:
 /*
  * Count number of session permitted by uid/gid.
  */
-static unsigned int lttng_sessions_count(uid_t uid, gid_t gid)
+static unsigned int lttng_sessions_count(uid_t uid,
+		gid_t gid __attribute__((unused)))
 {
 	unsigned int i = 0;
 	struct ltt_session *session;
@@ -763,6 +764,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) {
@@ -810,23 +815,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;
 }
 
@@ -2015,8 +2042,7 @@ skip_domain:
 	{
 		lttng_snapshot_output output = cmd_ctx->lsm.u.snapshot_record.output;
 		ret = cmd_snapshot_record(cmd_ctx->session,
-				&output,
-				cmd_ctx->lsm.u.snapshot_record.wait);
+				&output, 0); // RFC: set to zero since it's ignored by cmd_snapshot_record
 		break;
 	}
 	case LTTNG_CREATE_SESSION_EXT:
@@ -2409,7 +2435,7 @@ static void cleanup_client_thread(void *data)
 	lttng_pipe_destroy(quit_pipe);
 }
 
-static void thread_init_cleanup(void *data)
+static void thread_init_cleanup(void *data __attribute__((unused)))
 {
 	set_thread_status(false);
 }