Fix: Propagate filter status of kernel events to client

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

diff --git a/src/bin/lttng-sessiond/save.c b/src/bin/lttng-sessiond/save.c
index 0a1393a4bd90267bb9d5d041af3f6b40e007595b..a485491780edf8fec00499559d86ce08b9d16aec 100644 (file)
--- a/src/bin/lttng-sessiond/save.c
+++ b/src/bin/lttng-sessiond/save.c
@@ -363,6 +363,16 @@ int save_kernel_event(struct config_writer *writer,
                goto end;
        }
 
+       if (event->filter_expression) {
+               ret = config_writer_write_element_string(writer,
+                               config_element_filter,
+                               event->filter_expression);
+               if (ret) {
+                       ret = LTTNG_ERR_SAVE_IO_FAIL;
+                       goto end;
+               }
+       }
+
        if (event->event->instrumentation == LTTNG_KERNEL_FUNCTION ||
                event->event->instrumentation == LTTNG_KERNEL_KPROBE ||
                event->event->instrumentation == LTTNG_KERNEL_KRETPROBE) {
@@ -705,6 +715,10 @@ int save_ust_events(struct config_writer *writer,
        cds_lfht_for_each_entry(events->ht, &iter.iter, node, node) {
                event = caa_container_of(node, struct ltt_ust_event, node);
 
+               if (event->internal) {
+                       /* Internal events must not be exposed to clients */
+                       continue;
+               }
                ret = save_ust_event(writer, event);
                if (ret) {
                        rcu_read_unlock();