Disallow wildcards in event names except as the last character

[lttng-tools.git] / src / bin / lttng-sessiond / cmd.c

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 044e9eefec7e14eab9eb1046411395d1ccdebdff..0cc71303aeb6704de4bc926f39d0e2acbf58bc39 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -1301,6 +1301,38 @@ error:
        return ret;
 }
 
+static int validate_event_name(const char *name)
+{
+       int ret = 0;
+       const char *c = name;
+       const char *event_name_end = c + LTTNG_SYMBOL_NAME_LEN;
+
+       /*
+        * Make sure that unescaped wildcards are only used as the last
+        * character of the event name.
+        */
+       while (c < event_name_end) {
+               switch (*c) {
+               case '\0':
+                       goto end;
+               case '\\':
+                       c++;
+                       break;
+               case '*':
+                       if ((c + 1) < event_name_end && *(c + 1)) {
+                               /* Wildcard is not the last character */
+                               ret = LTTNG_ERR_INVALID_EVENT_NAME;
+                               goto end;
+                       }
+               default:
+                       break;
+               }
+               c++;
+       }
+end:
+       return ret;
+}
+
 /*
  * Command LTTNG_ENABLE_EVENT processed by the client thread.
  */
@@ -1318,6 +1350,11 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
        assert(event);
        assert(channel_name);
 
+       ret = validate_event_name(event->name);
+       if (ret) {
+               goto error;
+       }
+
        rcu_read_lock();
 
        switch (domain->type) {