X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=1922fd594c6dc519838a359dc9704eab7318ab01;hp=37c0e31ce9dfe73b9713088c83ed1427f83ad389;hb=99608320e6099c72850fa2df81e6f92fa38352d7;hpb=0b5a4de9aa05787410e50ce238ceb199a642154d

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 37c0e31ce..1922fd594 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -4283,6 +4283,20 @@ int cmd_register_trigger(struct command_ctx *cmd_ctx, int sock,
 		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(
@@ -4333,6 +4347,19 @@ int cmd_unregister_trigger(struct command_ctx *cmd_ctx, int sock,
 		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(