Fix: sessiond: assertion on inconsistent filter bytecode and expression

The session daemon correctly expects that a recording event-rule that
specifies a filter must have both a bytecode and an expression (or
neither of them).

However, it shouldn't assert as those elements are user-specified. The
handling is changed to return an "invalid parameter" error to the
client.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I3df6ce79bc6ce1fa9dadb184a7fd2b528dc2a597

diff --git a/src/bin/lttng-sessiond/cmd.cpp b/src/bin/lttng-sessiond/cmd.cpp
index f1b29da9ccdd9c9f937209df70061bbcb76607e0..76abcd65d02704891f57f2794d3f317df4f17f59 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.cpp
+++ b/src/bin/lttng-sessiond/cmd.cpp
@@ -2093,9 +2093,6 @@ static int _cmd_enable_event(ltt_session::locked_ref& locked_session,
        LTTNG_ASSERT(event);
        LTTNG_ASSERT(channel_name);
 
-       /* If we have a filter, we must have its filter expression */
-       LTTNG_ASSERT(!(!!filter_expression ^ !!filter));
-
        /* Normalize event name as a globbing pattern */
        strutils_normalize_star_glob_pattern(event->name);
 
@@ -2112,6 +2109,13 @@ static int _cmd_enable_event(ltt_session::locked_ref& locked_session,
 
        const lttng::urcu::read_lock_guard read_lock;
 
+       /* If we have a filter, we must have its filter expression. */
+       if (!!filter_expression ^ !!filter) {
+               DBG("Refusing to enable recording event rule as it has an inconsistent filter expression and bytecode specification");
+               ret = LTTNG_ERR_INVALID;
+               goto error;
+       }
+
        switch (domain->type) {
        case LTTNG_DOMAIN_KERNEL:
        {