Fix: 4.6 kernel: use in_compat_syscall

[lttng-modules.git] / lttng-filter-interpreter.c

diff --git a/lttng-filter-interpreter.c b/lttng-filter-interpreter.c
index ffce2150af3aacdb62789a21e413f9d7bb50ccac..8323fbbb2cfe01b6bb63d7d5baae9d734f572757 100644 (file)
--- a/lttng-filter-interpreter.c
+++ b/lttng-filter-interpreter.c
@@ -22,7 +22,7 @@
 
 #include <linux/uaccess.h>
 
-#include "lttng-filter.h"
+#include <lttng-filter.h>
 
 /*
  * get_char should be called with page fault handler disabled if it is expected
@@ -183,6 +183,7 @@ int stack_strcmp(struct estack *stack, int top, const char *cmp_type)
 }
 
 uint64_t lttng_filter_false(void *filter_data,
+               struct lttng_probe_ctx *lttng_probe_ctx,
                const char *filter_stack_data)
 {
        return 0;
@@ -240,6 +241,7 @@ LABEL_##name
  * effect.
  */
 uint64_t lttng_filter_interpret_bytecode(void *filter_data,
+               struct lttng_probe_ctx *lttng_probe_ctx,
                const char *filter_stack_data)
 {
        struct bytecode_runtime *bytecode = filter_data;
@@ -766,7 +768,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
                        dbg_printk("get context ref offset %u type string\n",
                                ref->offset);
                        ctx_field = &lttng_static_ctx->fields[ref->offset];
-                       ctx_field->get_value(ctx_field, &v);
+                       ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
                        estack_push(stack, top, ax, bx);
                        estack_ax(stack, top)->u.s.str = v.str;
                        if (unlikely(!estack_ax(stack, top)->u.s.str)) {
@@ -792,7 +794,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
                        dbg_printk("get context ref offset %u type s64\n",
                                ref->offset);
                        ctx_field = &lttng_static_ctx->fields[ref->offset];
-                       ctx_field->get_value(ctx_field, &v);
+                       ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
                        estack_push(stack, top, ax, bx);
                        estack_ax_v = v.s64;
                        dbg_printk("ref get context s64 %lld\n",
@@ -816,7 +818,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
                        dbg_printk("load field ref offset %u type user string\n",
                                ref->offset);
                        estack_push(stack, top, ax, bx);
-                       estack_ax(stack, top)->u.s.str =
+                       estack_ax(stack, top)->u.s.user_str =
                                *(const char * const *) &filter_stack_data[ref->offset];
                        if (unlikely(!estack_ax(stack, top)->u.s.str)) {
                                dbg_printk("Filter warning: loading a NULL string.\n");
@@ -841,7 +843,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
                        estack_push(stack, top, ax, bx);
                        estack_ax(stack, top)->u.s.seq_len =
                                *(unsigned long *) &filter_stack_data[ref->offset];
-                       estack_ax(stack, top)->u.s.str =
+                       estack_ax(stack, top)->u.s.user_str =
                                *(const char **) (&filter_stack_data[ref->offset
                                                                + sizeof(unsigned long)]);
                        if (unlikely(!estack_ax(stack, top)->u.s.str)) {