X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=39e824bdef7e4fc10fae81cafc8f2882d4a13e81;hp=86a162baf1f6ddfcefdaf729a286eec7ff8d20e1;hb=3e6e0df2f8f9f23d252c2508b6d741916dfcc4b3;hpb=8a82be4c62d09a7ef4792c0eed7c7903dfac8424;ds=sidebyside

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 86a162baf..39e824bde 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -3107,10 +3107,22 @@ enum lttng_error_code cmd_create_session(struct command_ctx *cmd_ctx, int sock,
 			&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);