X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=86a162baf1f6ddfcefdaf729a286eec7ff8d20e1;hb=242388e491e4219f967ee424d7bf02035a313e6f;hp=9a832b4558679f1a3586d578a9eca9a8b3e8980b;hpb=ff588497b3dfc3138c9ce005e9270ed5568c05df;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 9a832b455..86a162baf 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -4257,7 +4257,8 @@ end:
 }
 
 int cmd_register_trigger(struct command_ctx *cmd_ctx, int sock,
-		struct notification_thread_handle *notification_thread)
+		struct notification_thread_handle *notification_thread,
+		struct lttng_trigger **return_trigger)
 {
 	int ret;
 	size_t trigger_len;
@@ -4314,12 +4315,41 @@ int cmd_register_trigger(struct command_ctx *cmd_ctx, int sock,
 		}
 	}
 
-	/* Set the trigger credential */
-	lttng_trigger_set_credentials(trigger, &cmd_creds);
+	/*
+	 * Validate the trigger credentials against the command credentials.
+	 * Only the root user can register a trigger with non-matching
+	 * credentials.
+	 */
+	if (!lttng_credentials_is_equal_uid(
+			lttng_trigger_get_credentials(trigger),
+			&cmd_creds)) {
+		if (lttng_credentials_get_uid(&cmd_creds) != 0) {
+			ERR("Trigger credentials do not match the command credentials");
+			ret = LTTNG_ERR_INVALID_TRIGGER;
+			goto end;
+		}
+	}
 
-	/* Inform the notification thread */
+	/*
+	 * A reference to the trigger is acquired by the notification thread.
+	 * It is safe to return the same trigger to the caller since it the
+	 * other user holds a reference.
+	 *
+	 * The trigger is modified during the execution of the
+	 * "register trigger" command. However, by the time the command returns,
+	 * it is safe to use without any locking as its properties are
+	 * immutable.
+	 */
 	ret = notification_thread_command_register_trigger(notification_thread,
 			trigger);
+	if (ret != LTTNG_OK) {
+		goto end_notification_thread;
+	}
+
+	/* Return an updated trigger to the client. */
+	*return_trigger = trigger;
+
+end_notification_thread:
 	/* Ownership of trigger was transferred. */
 	trigger = NULL;
 end:
@@ -4385,7 +4415,20 @@ int cmd_unregister_trigger(struct command_ctx *cmd_ctx, int sock,
 		}
 	}
 
-	lttng_trigger_set_credentials(trigger, &cmd_creds);
+	/*
+	 * Validate the trigger credentials against the command credentials.
+	 * Only the root user can unregister a trigger with non-matching
+	 * credentials.
+	 */
+	if (!lttng_credentials_is_equal_uid(
+			lttng_trigger_get_credentials(trigger),
+			&cmd_creds)) {
+		if (lttng_credentials_get_uid(&cmd_creds) != 0) {
+			ERR("Trigger credentials do not match the command credentials");
+			ret = LTTNG_ERR_INVALID_TRIGGER;
+			goto end;
+		}
+	}
 
 	ret = notification_thread_command_unregister_trigger(notification_thread,
 			trigger);