op->op = FILTER_OP_LOAD_FIELD_REF_S64;
break;
case atype_array:
+ {
+ const struct lttng_basic_type *elem_type = &field->type.u.array.elem_type;
+
+ if (elem_type->atype != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
+ return -EINVAL;
+ if (elem_type->u.basic.integer.user)
+ op->op = FILTER_OP_LOAD_FIELD_REF_USER_SEQUENCE;
+ else
+ op->op = FILTER_OP_LOAD_FIELD_REF_SEQUENCE;
+ break;
+ }
case atype_sequence:
- if (field->user)
+ {
+ const struct lttng_basic_type *elem_type = &field->type.u.sequence.elem_type;
+
+ if (elem_type->atype != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
+ return -EINVAL;
+ if (elem_type->u.basic.integer.user)
op->op = FILTER_OP_LOAD_FIELD_REF_USER_SEQUENCE;
else
op->op = FILTER_OP_LOAD_FIELD_REF_SEQUENCE;
break;
+ }
case atype_string:
- if (field->user)
+ if (field->type.u.basic.string.user)
op->op = FILTER_OP_LOAD_FIELD_REF_USER_STRING;
else
op->op = FILTER_OP_LOAD_FIELD_REF_STRING;
op->op = FILTER_OP_GET_CONTEXT_REF_S64;
break;
/* Sequence and array supported as string */
- case atype_string:
case atype_array:
+ {
+ const struct lttng_basic_type *elem_type = &ctx_field->event_field.type.u.array.elem_type;
+
+ if (elem_type->atype != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
+ return -EINVAL;
+ BUG_ON(elem_type->u.basic.integer.user);
+ op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
+ break;
+ }
case atype_sequence:
- BUG_ON(ctx_field->event_field.user);
+ {
+ const struct lttng_basic_type *elem_type = &ctx_field->event_field.type.u.sequence.elem_type;
+
+ if (elem_type->atype != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
+ return -EINVAL;
+ BUG_ON(elem_type->u.basic.integer.user);
+ op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
+ break;
+ }
+ case atype_string:
+ BUG_ON(ctx_field->event_field.type.u.basic.string.user);
op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
break;
case atype_struct: /* Unsupported. */
runtime->len = filter_bytecode->bc.reloc_offset;
/* copy original bytecode */
memcpy(runtime->code, filter_bytecode->bc.data, runtime->len);
+ /* Validate bytecode load instructions before relocs. */
+ ret = lttng_filter_validate_bytecode_load(runtime);
+ if (ret) {
+ goto link_error;
+ }
/*
* apply relocs. Those are a uint16_t (offset in bytecode)
* followed by a string (field name).