Fix: Propagate filter status of kernel events to client

[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 01969b2b9607579a72877318b27418cf4942502a..e1fbf769cbfb2833ecd98dc6b2f168e98f71dd4b 100644 (file)
--- 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:
@@ -1779,6 +1781,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;
                                }