X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=f8fa4dedddda209c3280b05e71f105d45a79a66d;hb=f76d886f794c80a3c761613532d6a9a72a918cb8;hp=ac489fa2fa7f946a7c65a8b81d8f4572323ea16d;hpb=8404118c67ee01844e0bcee69d05c684689506b0;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index ac489fa2f..f8fa4dedd 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -380,6 +380,8 @@ static int list_lttng_kernel_events(char *channel_name,
 		strncpy((*events)[i].name, event->event->name, LTTNG_SYMBOL_NAME_LEN);
 		(*events)[i].name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
 		(*events)[i].enabled = event->enabled;
+		(*events)[i].filter =
+				(unsigned char) !!event->filter_expression;
 
 		switch (event->event->instrumentation) {
 		case LTTNG_KERNEL_TRACEPOINT:
@@ -1497,6 +1499,9 @@ static int _cmd_enable_event(struct ltt_session *session,
 	assert(event);
 	assert(channel_name);
 
+	/* If we have a filter, we must have its filter expression */
+	assert(!(!!filter_expression ^ !!filter));
+
 	DBG("Enable event command for event \'%s\'", event->name);
 
 	ret = validate_event_name(event->name);
@@ -1682,6 +1687,16 @@ static int _cmd_enable_event(struct ltt_session *session,
 			assert(uchan);
 		}
 
+		if (uchan->domain != LTTNG_DOMAIN_UST && !internal_event) {
+			/*
+			 * Don't allow users to add UST events to channels which
+			 * are assigned to a userspace subdomain (JUL, Log4J,
+			 * Python, etc.).
+			 */
+			ret = LTTNG_ERR_INVALID_CHANNEL_DOMAIN;
+			goto error;
+		}
+
 		if (!internal_event) {
 			/*
 			 * Ensure the event name is not reserved for internal
@@ -1726,7 +1741,7 @@ static int _cmd_enable_event(struct ltt_session *session,
 		if (!agt) {
 			agt = agent_create(domain->type);
 			if (!agt) {
-				ret = -LTTNG_ERR_NOMEM;
+				ret = LTTNG_ERR_NOMEM;
 				goto error;
 			}
 			agent_add(agt, usess->agents);
@@ -1738,7 +1753,7 @@ static int _cmd_enable_event(struct ltt_session *session,
 		uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
 		default_event_name = event_get_default_agent_ust_name(domain->type);
 		if (!default_event_name) {
-			ret = -LTTNG_ERR_FATAL;
+			ret = LTTNG_ERR_FATAL;
 			goto error;
 		}
 		strncpy(uevent.name, default_event_name, sizeof(uevent.name));
@@ -1776,6 +1791,7 @@ static int _cmd_enable_event(struct ltt_session *session,
 					sizeof(struct lttng_filter_bytecode)
 					+ filter->len);
 				if (!filter_copy) {
+					ret = LTTNG_ERR_NOMEM;
 					goto error;
 				}