X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-filter.c;h=4c053fbbfb1208bb94b00bb279bf463b49226ce0;hb=refs%2Fheads%2Fstable-2.12;hp=c33fa5f281c77be6714be9ecbfe85b2a2c0787cc;hpb=fead3a9cead4912b325d22229f7ad2fe656108e6;p=lttng-modules.git

diff --git a/lttng-filter.c b/lttng-filter.c
index c33fa5f2..4c053fbb 100644
--- a/lttng-filter.c
+++ b/lttng-filter.c
@@ -244,9 +244,9 @@ int apply_field_reloc(struct lttng_event *event,
 		{
 			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)
+			if (elem_type->atype != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
 				return -EINVAL;
-			if (field->user)
+			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;
@@ -256,16 +256,16 @@ int apply_field_reloc(struct lttng_event *event,
 		{
 			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)
+			if (elem_type->atype != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
 				return -EINVAL;
-			if (field->user)
+			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;
@@ -332,9 +332,9 @@ int apply_context_reloc(struct lttng_event *event,
 		{
 			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)
+			if (elem_type->atype != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
 				return -EINVAL;
-			BUG_ON(ctx_field->event_field.user);
+			BUG_ON(elem_type->u.basic.integer.user);
 			op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
 			break;
 		}
@@ -342,14 +342,14 @@ int apply_context_reloc(struct lttng_event *event,
 		{
 			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)
+			if (elem_type->atype != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
 				return -EINVAL;
-			BUG_ON(ctx_field->event_field.user);
+			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.user);
+			BUG_ON(ctx_field->event_field.type.u.basic.string.user);
 			op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
 			break;
 		case atype_struct:	/* Unsupported. */
@@ -455,6 +455,11 @@ int _lttng_filter_event_link_bytecode(struct lttng_event *event,
 	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).