X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-filter-interpreter.c;h=15f4747d296e5157e815cd05c0a6fbd47993a4d5;hb=refs%2Ftags%2Ffor-upstreaming-review-1;hp=3dad6cc6650830f2990ec410f09b523dd59573d3;hpb=80bb26003945e96a8ade9c8788dab9b2e08cbc08;p=lttng-modules.git diff --git a/lttng-filter-interpreter.c b/lttng-filter-interpreter.c index 3dad6cc6..15f4747d 100644 --- a/lttng-filter-interpreter.c +++ b/lttng-filter-interpreter.c @@ -7,15 +7,15 @@ * Copyright (C) 2010-2016 Mathieu Desnoyers */ -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include -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 @@ -30,8 +30,7 @@ char get_char(struct estack_entry *reg, size_t offset) 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. */ @@ -288,7 +287,7 @@ static int context_get_index(struct lttng_probe_ctx *lttng_probe_ctx, switch (field->type.atype) { case atype_integer: ctx_field->get_value(ctx_field, lttng_probe_ctx, &v); - if (field->type.u.basic.integer.signedness) { + if (field->type.u.integer.signedness) { ptr->object_type = OBJECT_TYPE_S64; ptr->u.s64 = v.s64; ptr->ptr = &ptr->u.s64; @@ -298,10 +297,10 @@ static int context_get_index(struct lttng_probe_ctx *lttng_probe_ctx, ptr->ptr = &ptr->u.u64; } break; - case atype_enum: + case atype_enum_nestable: { const struct lttng_integer_type *itype = - &field->type.u.basic.enumeration.container_type; + &field->type.u.enum_nestable.container_type->u.integer; ctx_field->get_value(ctx_field, lttng_probe_ctx, &v); if (itype->signedness) { @@ -315,12 +314,12 @@ static int context_get_index(struct lttng_probe_ctx *lttng_probe_ctx, } break; } - case atype_array: - if (field->type.u.array.elem_type.atype != atype_integer) { + case atype_array_nestable: + if (!lttng_is_bytewise_integer(field->type.u.array_nestable.elem_type)) { printk(KERN_WARNING "Array nesting only supports integer types.\n"); return -EINVAL; } - if (field->type.u.array.elem_type.u.basic.integer.encoding == lttng_encode_none) { + if (field->type.u.array_nestable.elem_type->u.integer.encoding == lttng_encode_none) { printk(KERN_WARNING "Only string arrays are supported for contexts.\n"); return -EINVAL; } @@ -328,12 +327,12 @@ static int context_get_index(struct lttng_probe_ctx *lttng_probe_ctx, ctx_field->get_value(ctx_field, lttng_probe_ctx, &v); ptr->ptr = v.str; break; - case atype_sequence: - if (field->type.u.sequence.elem_type.atype != atype_integer) { + case atype_sequence_nestable: + if (!lttng_is_bytewise_integer(field->type.u.sequence_nestable.elem_type)) { printk(KERN_WARNING "Sequence nesting only supports integer types.\n"); return -EINVAL; } - if (field->type.u.sequence.elem_type.u.basic.integer.encoding == lttng_encode_none) { + if (field->type.u.sequence_nestable.elem_type->u.integer.encoding == lttng_encode_none) { printk(KERN_WARNING "Only string sequences are supported for contexts.\n"); return -EINVAL; } @@ -341,20 +340,17 @@ static int context_get_index(struct lttng_probe_ctx *lttng_probe_ctx, ctx_field->get_value(ctx_field, lttng_probe_ctx, &v); ptr->ptr = v.str; break; - case atype_array_bitfield: - printk(KERN_WARNING "Bitfield array type is not supported.\n"); - return -EINVAL; - case atype_sequence_bitfield: - printk(KERN_WARNING "Bitfield sequence type is not supported.\n"); - return -EINVAL; case atype_string: ptr->object_type = OBJECT_TYPE_STRING; ctx_field->get_value(ctx_field, lttng_probe_ctx, &v); ptr->ptr = v.str; break; - case atype_struct: + case atype_struct_nestable: printk(KERN_WARNING "Structure type cannot be loaded.\n"); return -EINVAL; + case atype_variant_nestable: + printk(KERN_WARNING "Variant type cannot be loaded.\n"); + return -EINVAL; default: printk(KERN_WARNING "Unknown type: %d", (int) field->type.atype); return -EINVAL; @@ -555,7 +551,7 @@ static int dynamic_load_field(struct estack_entry *stack_top) 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; @@ -1132,7 +1128,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data, 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; @@ -1196,7 +1192,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data, 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; @@ -1211,7 +1207,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data, 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; @@ -1276,7 +1272,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data, 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; @@ -1326,7 +1322,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data, 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; @@ -1542,7 +1538,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data, 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);