Fix: bytecode: Validate register type for instructions expecting unknown type

[lttng-modules.git] / include / lttng / events.h

diff --git a/include/lttng/events.h b/include/lttng/events.h
index 61d37d70bdde54073ba5506f6bec36579733cb1e..194e89004cb3b451c17719990c3266e9deb9f139 100644 (file)
--- a/include/lttng/events.h
+++ b/include/lttng/events.h
@@ -10,12 +10,12 @@
 #ifndef _LTTNG_EVENTS_H
 #define _LTTNG_EVENTS_H
 
-#include <linux/irq_work.h>
 #include <linux/version.h>
 #include <linux/list.h>
 #include <linux/kprobes.h>
 #include <linux/kref.h>
 #include <linux/uuid.h>
+#include <linux/irq_work.h>
 #include <wrapper/uprobes.h>
 #include <lttng/cpuhotplug.h>
 #include <lttng/tracer.h>
@@ -299,12 +299,6 @@ enum lttng_syscall_abi {
        LTTNG_SYSCALL_ABI_COMPAT,
 };
 
-struct lttng_syscall {
-       struct list_head node;                  /* chain registered syscall event_notifier */
-       unsigned int syscall_id;
-       bool is_compat;
-};
-
 /*
  * lttng_event structure is referred to by the tracing fast path. It must be
  * kept small.
@@ -326,7 +320,6 @@ struct lttng_event {
                } kretprobe;
                struct lttng_uprobe uprobe;
                struct {
-                       char *syscall_name;
                        enum lttng_syscall_entryexit entryexit;
                        enum lttng_syscall_abi abi;
                } syscall;
@@ -339,7 +332,7 @@ struct lttng_event {
        struct hlist_node hlist;        /* session ht of events */
        int registered;                 /* has reg'd tracepoint probe */
        /* list of struct lttng_bytecode_runtime, sorted by seqnum */
-       struct list_head bytecode_runtime_head;
+       struct list_head filter_bytecode_runtime_head;
        int has_enablers_without_bytecode;
 };
 
@@ -357,14 +350,20 @@ struct lttng_event_notifier {
        union {
                struct lttng_kprobe kprobe;
                struct lttng_uprobe uprobe;
-               struct lttng_syscall syscall;
+               struct {
+                       enum lttng_syscall_entryexit entryexit;
+                       enum lttng_syscall_abi abi;
+                       struct hlist_node node;                 /* chain registered syscall event_notifier */
+                       unsigned int syscall_id;
+               } syscall;
+
        } u;
 
        /* Backward references: list of lttng_enabler_ref (ref to enablers) */
        struct list_head enablers_ref_head;
        struct hlist_node hlist;        /* session ht of event_notifiers */
        /* list of struct lttng_bytecode_runtime, sorted by seqnum */
-       struct list_head bytecode_runtime_head;
+       struct list_head filter_bytecode_runtime_head;
        int has_enablers_without_bytecode;
 
        void (*send_notification)(struct lttng_event_notifier *event_notifier);
@@ -636,12 +635,28 @@ struct lttng_event_notifier_group {
        struct lib_ring_buffer *buf;    /* Ring buffer for event notifier group. */
        wait_queue_head_t read_wait;
        struct irq_work wakeup_pending; /* Pending wakeup irq work. */
+       struct lttng_event_notifier *sc_unknown;        /* for unknown syscalls */
+       struct lttng_event_notifier *sc_compat_unknown;
+
+       struct lttng_syscall_filter *sc_filter;
+
+       struct hlist_head *event_notifier_syscall_dispatch;
+       struct hlist_head *event_notifier_compat_syscall_dispatch;
+       struct hlist_head *event_notifier_exit_syscall_dispatch;
+       struct hlist_head *event_notifier_exit_compat_syscall_dispatch;
 
-       struct list_head *event_notifier_syscall_dispatch;
-       struct list_head *event_notifier_compat_syscall_dispatch;
+       struct hlist_head event_notifier_unknown_syscall_dispatch;
+       struct hlist_head event_notifier_compat_unknown_syscall_dispatch;
+       struct hlist_head event_notifier_exit_unknown_syscall_dispatch;
+       struct hlist_head event_notifier_exit_compat_unknown_syscall_dispatch;
 
-       unsigned int syscall_all:1,
-               sys_enter_registered:1;
+       int syscall_all_entry;
+       int syscall_all_exit;
+
+       unsigned int sys_enter_registered:1, sys_exit_registered:1;
+
+       struct lttng_counter *error_counter;
+       size_t error_counter_len;
 };
 
 struct lttng_metadata_cache {
@@ -790,10 +805,13 @@ int lttng_desc_match_enabler(const struct lttng_event_desc *desc,
 int lttng_syscalls_register_event(struct lttng_channel *chan, void *filter);
 int lttng_syscalls_unregister_event(struct lttng_channel *chan);
 int lttng_syscalls_destroy_event(struct lttng_channel *chan);
-int lttng_syscall_filter_enable_event(struct lttng_channel *chan,
+int lttng_syscall_filter_enable_event(
+               struct lttng_channel *chan,
                struct lttng_event *event);
-int lttng_syscall_filter_disable_event(struct lttng_channel *chan,
+int lttng_syscall_filter_disable_event(
+               struct lttng_channel *chan,
                struct lttng_event *event);
+
 long lttng_channel_syscall_mask(struct lttng_channel *channel,
                struct lttng_kernel_syscall_mask __user *usyscall_mask);
 
@@ -869,9 +887,9 @@ static inline int lttng_syscall_filter_disable_event_notifier(
 #endif
 
 void lttng_filter_sync_state(struct lttng_bytecode_runtime *runtime);
-int lttng_event_enabler_attach_bytecode(struct lttng_event_enabler *event_enabler,
+int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler *event_enabler,
                struct lttng_kernel_filter_bytecode __user *bytecode);
-int lttng_event_notifier_enabler_attach_bytecode(
+int lttng_event_notifier_enabler_attach_filter_bytecode(
                struct lttng_event_notifier_enabler *event_notifier_enabler,
                struct lttng_kernel_filter_bytecode __user *bytecode);