* Copyright (C) 2010-2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
-#include <wrapper/uaccess.h>
-#include <wrapper/frame.h>
-#include <wrapper/types.h>
+#include <linux/uaccess.h>
+#include <linux/frame.h>
+#include <linux/limits.h>
#include <linux/swab.h>
#include <lttng-filter.h>
#include <lttng-string-utils.h>
-LTTNG_STACK_FRAME_NON_STANDARD(lttng_filter_interpret_bytecode);
+STACK_FRAME_NON_STANDARD(lttng_filter_interpret_bytecode);
/*
* get_char should be called with page fault handler disabled if it is expected
char c;
/* Handle invalid access as end of string. */
- if (unlikely(!lttng_access_ok(VERIFY_READ,
- reg->u.s.user_str + offset,
+ if (unlikely(!access_ok(reg->u.s.user_str + offset,
sizeof(c))))
return '\0';
/* Handle fault (nonzero return value) as end of string. */
ret = -EINVAL;
goto end;
}
- stack_top->u.s.seq_len = LTTNG_SIZE_MAX;
+ stack_top->u.s.seq_len = SIZE_MAX;
stack_top->u.s.literal_type =
ESTACK_STRING_LITERAL_TYPE_NONE;
break;
ret = -EINVAL;
goto end;
}
- estack_ax(stack, top)->u.s.seq_len = LTTNG_SIZE_MAX;
+ estack_ax(stack, top)->u.s.seq_len = SIZE_MAX;
estack_ax(stack, top)->u.s.literal_type =
ESTACK_STRING_LITERAL_TYPE_NONE;
estack_ax(stack, top)->u.s.user = 0;
dbg_printk("load string %s\n", insn->data);
estack_push(stack, top, ax, bx);
estack_ax(stack, top)->u.s.str = insn->data;
- estack_ax(stack, top)->u.s.seq_len = LTTNG_SIZE_MAX;
+ estack_ax(stack, top)->u.s.seq_len = SIZE_MAX;
estack_ax(stack, top)->u.s.literal_type =
ESTACK_STRING_LITERAL_TYPE_PLAIN;
estack_ax(stack, top)->u.s.user = 0;
dbg_printk("load globbing pattern %s\n", insn->data);
estack_push(stack, top, ax, bx);
estack_ax(stack, top)->u.s.str = insn->data;
- estack_ax(stack, top)->u.s.seq_len = LTTNG_SIZE_MAX;
+ estack_ax(stack, top)->u.s.seq_len = SIZE_MAX;
estack_ax(stack, top)->u.s.literal_type =
ESTACK_STRING_LITERAL_TYPE_STAR_GLOB;
estack_ax(stack, top)->u.s.user = 0;
ret = -EINVAL;
goto end;
}
- estack_ax(stack, top)->u.s.seq_len = LTTNG_SIZE_MAX;
+ estack_ax(stack, top)->u.s.seq_len = SIZE_MAX;
estack_ax(stack, top)->u.s.literal_type =
ESTACK_STRING_LITERAL_TYPE_NONE;
estack_ax(stack, top)->u.s.user = 0;
ret = -EINVAL;
goto end;
}
- estack_ax(stack, top)->u.s.seq_len = LTTNG_SIZE_MAX;
+ estack_ax(stack, top)->u.s.seq_len = SIZE_MAX;
estack_ax(stack, top)->u.s.literal_type =
ESTACK_STRING_LITERAL_TYPE_NONE;
estack_ax(stack, top)->u.s.user = 1;
ret = -EINVAL;
goto end;
}
- estack_ax(stack, top)->u.s.seq_len = LTTNG_SIZE_MAX;
+ estack_ax(stack, top)->u.s.seq_len = SIZE_MAX;
estack_ax(stack, top)->u.s.literal_type =
ESTACK_STRING_LITERAL_TYPE_NONE;
next_pc += sizeof(struct load_op);