summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
5d519a9)
The bytecode linker should only allow linking filter expressions loading
fields which are string-encoded arrays and sequence for comparison
against a string, and reject arrays and sequences without encoding, so
the filter interpreter does not attempt to load non-NULL terminated
arrays/sequences as if they were strings.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: Ic13fbbb0d601eddbb7d98f4a5e13fe3f45612fd8
op->op = FILTER_OP_LOAD_FIELD_REF_S64;
break;
case atype_array:
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_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
+ return -EINVAL;
+ op->op = FILTER_OP_LOAD_FIELD_REF_SEQUENCE;
+ break;
+ }
+ {
+ const struct lttng_basic_type *elem_type = &field->type.u.sequence.elem_type;
+
+ if (elem_type != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
+ return -EINVAL;
op->op = FILTER_OP_LOAD_FIELD_REF_SEQUENCE;
break;
op->op = FILTER_OP_LOAD_FIELD_REF_SEQUENCE;
break;
case atype_string:
op->op = FILTER_OP_LOAD_FIELD_REF_STRING;
break;
case atype_string:
op->op = FILTER_OP_LOAD_FIELD_REF_STRING;
break;
op->op = FILTER_OP_GET_CONTEXT_REF_S64;
break;
/* Sequence and array supported as string */
op->op = FILTER_OP_GET_CONTEXT_REF_S64;
break;
/* Sequence and array supported as string */
+ {
+ const struct lttng_basic_type *elem_type = &ctx_field->event_field.type.u.array.elem_type;
+
+ if (elem_type != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
+ return -EINVAL;
+ op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
+ break;
+ }
+ {
+ const struct lttng_basic_type *elem_type = &ctx_field->event_field.type.u.sequence.elem_type;
+
+ if (elem_type != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
+ return -EINVAL;
+ op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
+ break;
+ }
+ case atype_string:
op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
break;
case atype_float:
op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
break;
case atype_float: