X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-filter-validator.c;h=acc91ba97a17fd9eda9def96e38b2e3f62eb9ea6;hb=3194ee997a63cbe35c4e95394ce4d4654eeeea8e;hp=eb3d67d89e66ac70db54746e6d01e7ebaedbdb48;hpb=22389ecb8b7867bc1d21b1e11ba7572be8eca81f;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-filter-validator.c b/liblttng-ust/lttng-filter-validator.c
index eb3d67d8..acc91ba9 100644
--- a/liblttng-ust/lttng-filter-validator.c
+++ b/liblttng-ust/lttng-filter-validator.c
@@ -3,21 +3,25 @@
  *
  * LTTng UST filter bytecode validator.
  *
- * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2010-2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #define _LGPL_SOURCE
@@ -27,6 +31,7 @@
 
 #include <urcu/rculfhash.h>
 #include "lttng-hash-helper.h"
+#include "string-utils.h"
 
 /*
  * Number of merge points for hash table size. Hash table initialized to
@@ -124,7 +129,8 @@ int merge_point_add_check(struct cds_lfht *ht, unsigned long target_pc,
  * (unknown), negative error value on error.
  */
 static
-int bin_op_compare_check(struct vstack *stack, const char *str)
+int bin_op_compare_check(struct vstack *stack, filter_opcode_t opcode,
+		const char *str)
 {
 	if (unlikely(!vstack_ax(stack) || !vstack_bx(stack)))
 		goto error_empty;
@@ -144,6 +150,29 @@ int bin_op_compare_check(struct vstack *stack, const char *str)
 			goto unknown;
 		case REG_STRING:
 			break;
+		case REG_STAR_GLOB_STRING:
+			if (opcode != FILTER_OP_EQ && opcode != FILTER_OP_NE) {
+				goto error_mismatch;
+			}
+			break;
+		case REG_S64:
+		case REG_DOUBLE:
+			goto error_mismatch;
+		}
+		break;
+	case REG_STAR_GLOB_STRING:
+		switch (vstack_bx(stack)->type) {
+		default:
+			goto error_type;
+
+		case REG_UNKNOWN:
+			goto unknown;
+		case REG_STRING:
+			if (opcode != FILTER_OP_EQ && opcode != FILTER_OP_NE) {
+				goto error_mismatch;
+			}
+			break;
+		case REG_STAR_GLOB_STRING:
 		case REG_S64:
 		case REG_DOUBLE:
 			goto error_mismatch;
@@ -158,6 +187,7 @@ int bin_op_compare_check(struct vstack *stack, const char *str)
 		case REG_UNKNOWN:
 			goto unknown;
 		case REG_STRING:
+		case REG_STAR_GLOB_STRING:
 			goto error_mismatch;
 		case REG_S64:
 		case REG_DOUBLE:
@@ -183,6 +213,68 @@ error_type:
 	return -EINVAL;
 }
 
+/*
+ * Binary bitwise operators use top of stack and top of stack -1.
+ * Return 0 if typing is known to match, 1 if typing is dynamic
+ * (unknown), negative error value on error.
+ */
+static
+int bin_op_bitwise_check(struct vstack *stack, filter_opcode_t opcode,
+		const char *str)
+{
+	if (unlikely(!vstack_ax(stack) || !vstack_bx(stack)))
+		goto error_empty;
+
+	switch (vstack_ax(stack)->type) {
+	default:
+		goto error_type;
+
+	case REG_UNKNOWN:
+		goto unknown;
+	case REG_S64:
+		switch (vstack_bx(stack)->type) {
+		default:
+			goto error_type;
+
+		case REG_UNKNOWN:
+			goto unknown;
+		case REG_S64:
+			break;
+		}
+		break;
+	}
+	return 0;
+
+unknown:
+	return 1;
+
+error_empty:
+	ERR("empty stack for '%s' binary operator\n", str);
+	return -EINVAL;
+
+error_type:
+	ERR("unknown type for '%s' binary operator\n", str);
+	return -EINVAL;
+}
+
+static
+int validate_get_symbol(struct bytecode_runtime *bytecode,
+		const struct get_symbol *sym)
+{
+	const char *str, *str_limit;
+	size_t len_limit;
+
+	if (sym->offset >= bytecode->p.bc->bc.len - bytecode->p.bc->bc.reloc_offset)
+		return -EINVAL;
+
+	str = bytecode->p.bc->bc.data + bytecode->p.bc->bc.reloc_offset + sym->offset;
+	str_limit = bytecode->p.bc->bc.data + bytecode->p.bc->bc.len;
+	len_limit = str_limit - str;
+	if (strnlen(str, len_limit) == len_limit)
+		return -EINVAL;
+	return 0;
+}
+
 /*
  * Validate bytecode range overflow within the validation pass.
  * Called for each instruction encountered.
@@ -204,6 +296,7 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 	}
 
 	case FILTER_OP_RETURN:
+	case FILTER_OP_RETURN_S64:
 	{
 		if (unlikely(pc + sizeof(struct return_op)
 				> start_pc + bytecode->len)) {
@@ -218,11 +311,6 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 	case FILTER_OP_MOD:
 	case FILTER_OP_PLUS:
 	case FILTER_OP_MINUS:
-	case FILTER_OP_RSHIFT:
-	case FILTER_OP_LSHIFT:
-	case FILTER_OP_BIN_AND:
-	case FILTER_OP_BIN_OR:
-	case FILTER_OP_BIN_XOR:
 	{
 		ERR("unsupported bytecode op %u\n",
 			(unsigned int) *(filter_opcode_t *) pc);
@@ -242,6 +330,8 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 	case FILTER_OP_LT_STRING:
 	case FILTER_OP_GE_STRING:
 	case FILTER_OP_LE_STRING:
+	case FILTER_OP_EQ_STAR_GLOB_STRING:
+	case FILTER_OP_NE_STAR_GLOB_STRING:
 	case FILTER_OP_EQ_S64:
 	case FILTER_OP_NE_S64:
 	case FILTER_OP_GT_S64:
@@ -266,6 +356,11 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 	case FILTER_OP_LT_S64_DOUBLE:
 	case FILTER_OP_GE_S64_DOUBLE:
 	case FILTER_OP_LE_S64_DOUBLE:
+	case FILTER_OP_BIT_RSHIFT:
+	case FILTER_OP_BIT_LSHIFT:
+	case FILTER_OP_BIT_AND:
+	case FILTER_OP_BIT_OR:
+	case FILTER_OP_BIT_XOR:
 	{
 		if (unlikely(pc + sizeof(struct binary_op)
 				> start_pc + bytecode->len)) {
@@ -284,6 +379,7 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 	case FILTER_OP_UNARY_PLUS_DOUBLE:
 	case FILTER_OP_UNARY_MINUS_DOUBLE:
 	case FILTER_OP_UNARY_NOT_DOUBLE:
+	case FILTER_OP_UNARY_BIT_NOT:
 	{
 		if (unlikely(pc + sizeof(struct unary_op)
 				> start_pc + bytecode->len)) {
@@ -303,14 +399,8 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 		break;
 	}
 
-	/* load field ref */
+	/* load field and get context ref */
 	case FILTER_OP_LOAD_FIELD_REF:
-	{
-		ERR("Unknown field ref type\n");
-		ret = -EINVAL;
-		break;
-	}
-	/* get context ref */
 	case FILTER_OP_GET_CONTEXT_REF:
 	case FILTER_OP_LOAD_FIELD_REF_STRING:
 	case FILTER_OP_LOAD_FIELD_REF_SEQUENCE:
@@ -329,6 +419,7 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 
 	/* load from immediate operand */
 	case FILTER_OP_LOAD_STRING:
+	case FILTER_OP_LOAD_STAR_GLOB_STRING:
 	{
 		struct load_op *insn = (struct load_op *) pc;
 		uint32_t str_len, maxlen;
@@ -377,6 +468,62 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 		break;
 	}
 
+	/*
+	 * Instructions for recursive traversal through composed types.
+	 */
+	case FILTER_OP_GET_CONTEXT_ROOT:
+	case FILTER_OP_GET_APP_CONTEXT_ROOT:
+	case FILTER_OP_GET_PAYLOAD_ROOT:
+	case FILTER_OP_LOAD_FIELD:
+	case FILTER_OP_LOAD_FIELD_S8:
+	case FILTER_OP_LOAD_FIELD_S16:
+	case FILTER_OP_LOAD_FIELD_S32:
+	case FILTER_OP_LOAD_FIELD_S64:
+	case FILTER_OP_LOAD_FIELD_U8:
+	case FILTER_OP_LOAD_FIELD_U16:
+	case FILTER_OP_LOAD_FIELD_U32:
+	case FILTER_OP_LOAD_FIELD_U64:
+	case FILTER_OP_LOAD_FIELD_STRING:
+	case FILTER_OP_LOAD_FIELD_SEQUENCE:
+	case FILTER_OP_LOAD_FIELD_DOUBLE:
+		if (unlikely(pc + sizeof(struct load_op)
+				> start_pc + bytecode->len)) {
+			ret = -ERANGE;
+		}
+		break;
+
+	case FILTER_OP_GET_SYMBOL:
+	{
+		struct load_op *insn = (struct load_op *) pc;
+		struct get_symbol *sym = (struct get_symbol *) insn->data;
+
+		if (unlikely(pc + sizeof(struct load_op) + sizeof(struct get_symbol)
+				> start_pc + bytecode->len)) {
+			ret = -ERANGE;
+			break;
+		}
+		ret = validate_get_symbol(bytecode, sym);
+		break;
+	}
+
+	case FILTER_OP_GET_SYMBOL_FIELD:
+		ERR("Unexpected get symbol field");
+		ret = -EINVAL;
+		break;
+
+	case FILTER_OP_GET_INDEX_U16:
+		if (unlikely(pc + sizeof(struct load_op) + sizeof(struct get_index_u16)
+				> start_pc + bytecode->len)) {
+			ret = -ERANGE;
+		}
+		break;
+
+	case FILTER_OP_GET_INDEX_U64:
+		if (unlikely(pc + sizeof(struct load_op) + sizeof(struct get_index_u64)
+				> start_pc + bytecode->len)) {
+			ret = -ERANGE;
+		}
+		break;
 	}
 
 	return ret;
@@ -413,8 +560,9 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
 		char *pc)
 {
 	int ret = 0;
+	const filter_opcode_t opcode = *(filter_opcode_t *) pc;
 
-	switch (*(filter_opcode_t *) pc) {
+	switch (opcode) {
 	case FILTER_OP_UNKNOWN:
 	default:
 	{
@@ -425,6 +573,7 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
 	}
 
 	case FILTER_OP_RETURN:
+	case FILTER_OP_RETURN_S64:
 	{
 		goto end;
 	}
@@ -435,56 +584,51 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
 	case FILTER_OP_MOD:
 	case FILTER_OP_PLUS:
 	case FILTER_OP_MINUS:
-	case FILTER_OP_RSHIFT:
-	case FILTER_OP_LSHIFT:
-	case FILTER_OP_BIN_AND:
-	case FILTER_OP_BIN_OR:
-	case FILTER_OP_BIN_XOR:
 	{
 		ERR("unsupported bytecode op %u\n",
-			(unsigned int) *(filter_opcode_t *) pc);
+			(unsigned int) opcode);
 		ret = -EINVAL;
 		goto end;
 	}
 
 	case FILTER_OP_EQ:
 	{
-		ret = bin_op_compare_check(stack, "==");
+		ret = bin_op_compare_check(stack, opcode, "==");
 		if (ret < 0)
 			goto end;
 		break;
 	}
 	case FILTER_OP_NE:
 	{
-		ret = bin_op_compare_check(stack, "!=");
+		ret = bin_op_compare_check(stack, opcode, "!=");
 		if (ret < 0)
 			goto end;
 		break;
 	}
 	case FILTER_OP_GT:
 	{
-		ret = bin_op_compare_check(stack, ">");
+		ret = bin_op_compare_check(stack, opcode, ">");
 		if (ret < 0)
 			goto end;
 		break;
 	}
 	case FILTER_OP_LT:
 	{
-		ret = bin_op_compare_check(stack, "<");
+		ret = bin_op_compare_check(stack, opcode, "<");
 		if (ret < 0)
 			goto end;
 		break;
 	}
 	case FILTER_OP_GE:
 	{
-		ret = bin_op_compare_check(stack, ">=");
+		ret = bin_op_compare_check(stack, opcode, ">=");
 		if (ret < 0)
 			goto end;
 		break;
 	}
 	case FILTER_OP_LE:
 	{
-		ret = bin_op_compare_check(stack, "<=");
+		ret = bin_op_compare_check(stack, opcode, "<=");
 		if (ret < 0)
 			goto end;
 		break;
@@ -511,6 +655,23 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
 		break;
 	}
 
+	case FILTER_OP_EQ_STAR_GLOB_STRING:
+	case FILTER_OP_NE_STAR_GLOB_STRING:
+	{
+		if (!vstack_ax(stack) || !vstack_bx(stack)) {
+			ERR("Empty stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		if (vstack_ax(stack)->type != REG_STAR_GLOB_STRING
+				&& vstack_bx(stack)->type != REG_STAR_GLOB_STRING) {
+			ERR("Unexpected register type for globbing pattern comparator\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		break;
+	}
+
 	case FILTER_OP_EQ_S64:
 	case FILTER_OP_NE_S64:
 	case FILTER_OP_GT_S64:
@@ -592,6 +753,32 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
 		break;
 	}
 
+	case FILTER_OP_BIT_RSHIFT:
+		ret = bin_op_bitwise_check(stack, opcode, ">>");
+		if (ret < 0)
+			goto end;
+		break;
+	case FILTER_OP_BIT_LSHIFT:
+		ret = bin_op_bitwise_check(stack, opcode, "<<");
+		if (ret < 0)
+			goto end;
+		break;
+	case FILTER_OP_BIT_AND:
+		ret = bin_op_bitwise_check(stack, opcode, "&");
+		if (ret < 0)
+			goto end;
+		break;
+	case FILTER_OP_BIT_OR:
+		ret = bin_op_bitwise_check(stack, opcode, "|");
+		if (ret < 0)
+			goto end;
+		break;
+	case FILTER_OP_BIT_XOR:
+		ret = bin_op_bitwise_check(stack, opcode, "^");
+		if (ret < 0)
+			goto end;
+		break;
+
 	/* unary */
 	case FILTER_OP_UNARY_PLUS:
 	case FILTER_OP_UNARY_MINUS:
@@ -609,6 +796,7 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
 			goto end;
 
 		case REG_STRING:
+		case REG_STAR_GLOB_STRING:
 			ERR("Unary op can only be applied to numeric or floating point registers\n");
 			ret = -EINVAL;
 			goto end;
@@ -621,6 +809,32 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
 		}
 		break;
 	}
+	case FILTER_OP_UNARY_BIT_NOT:
+	{
+		if (!vstack_ax(stack)) {
+			ERR("Empty stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		switch (vstack_ax(stack)->type) {
+		default:
+			ERR("unknown register type\n");
+			ret = -EINVAL;
+			goto end;
+
+		case REG_STRING:
+		case REG_STAR_GLOB_STRING:
+		case REG_DOUBLE:
+			ERR("Unary bitwise op can only be applied to numeric registers\n");
+			ret = -EINVAL;
+			goto end;
+		case REG_S64:
+			break;
+		case REG_UNKNOWN:
+			break;
+		}
+		break;
+	}
 
 	case FILTER_OP_UNARY_PLUS_S64:
 	case FILTER_OP_UNARY_MINUS_S64:
@@ -722,6 +936,7 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
 
 	/* load from immediate operand */
 	case FILTER_OP_LOAD_STRING:
+	case FILTER_OP_LOAD_STAR_GLOB_STRING:
 	{
 		break;
 	}
@@ -753,6 +968,7 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
 			goto end;
 
 		case REG_STRING:
+		case REG_STAR_GLOB_STRING:
 			ERR("Cast op can only be applied to numeric or floating point registers\n");
 			ret = -EINVAL;
 			goto end;
@@ -815,6 +1031,93 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
 		break;
 	}
 
+	/*
+	 * Instructions for recursive traversal through composed types.
+	 */
+	case FILTER_OP_GET_CONTEXT_ROOT:
+	{
+		dbg_printf("Validate get context root\n");
+		break;
+	}
+	case FILTER_OP_GET_APP_CONTEXT_ROOT:
+	{
+		dbg_printf("Validate get app context root\n");
+		break;
+	}
+	case FILTER_OP_GET_PAYLOAD_ROOT:
+	{
+		dbg_printf("Validate get payload root\n");
+		break;
+	}
+	case FILTER_OP_LOAD_FIELD:
+	{
+		/*
+		 * We tolerate that field type is unknown at validation,
+		 * because we are performing the load specialization in
+		 * a phase after validation.
+		 */
+		dbg_printf("Validate load field\n");
+		break;
+	}
+
+	/*
+	 * Disallow already specialized bytecode op load field instructions to
+	 * ensure that the received bytecode does not read a memory area larger
+	 * than the memory targeted by the instrumentation.
+	 */
+	case FILTER_OP_LOAD_FIELD_S8:
+	case FILTER_OP_LOAD_FIELD_S16:
+	case FILTER_OP_LOAD_FIELD_S32:
+	case FILTER_OP_LOAD_FIELD_S64:
+	case FILTER_OP_LOAD_FIELD_U8:
+	case FILTER_OP_LOAD_FIELD_U16:
+	case FILTER_OP_LOAD_FIELD_U32:
+	case FILTER_OP_LOAD_FIELD_U64:
+	case FILTER_OP_LOAD_FIELD_STRING:
+	case FILTER_OP_LOAD_FIELD_SEQUENCE:
+	case FILTER_OP_LOAD_FIELD_DOUBLE:
+	{
+		dbg_printf("Validate load field, reject specialized load instruction (%d)\n",
+				(int) opcode);
+		ret = -EINVAL;
+		goto end;
+	}
+
+	case FILTER_OP_GET_SYMBOL:
+	{
+		struct load_op *insn = (struct load_op *) pc;
+		struct get_symbol *sym = (struct get_symbol *) insn->data;
+
+		dbg_printf("Validate get symbol offset %u\n", sym->offset);
+		break;
+	}
+
+	case FILTER_OP_GET_SYMBOL_FIELD:
+	{
+		struct load_op *insn = (struct load_op *) pc;
+		struct get_symbol *sym = (struct get_symbol *) insn->data;
+
+		dbg_printf("Validate get symbol field offset %u\n", sym->offset);
+		break;
+	}
+
+	case FILTER_OP_GET_INDEX_U16:
+	{
+		struct load_op *insn = (struct load_op *) pc;
+		struct get_index_u16 *get_index = (struct get_index_u16 *) insn->data;
+
+		dbg_printf("Validate get index u16 index %u\n", get_index->index);
+		break;
+	}
+
+	case FILTER_OP_GET_INDEX_U64:
+	{
+		struct load_op *insn = (struct load_op *) pc;
+		struct get_index_u64 *get_index = (struct get_index_u64 *) insn->data;
+
+		dbg_printf("Validate get index u64 index %" PRIu64 "\n", get_index->index);
+		break;
+	}
 	}
 end:
 	return ret;
@@ -852,7 +1155,7 @@ int validate_instruction_all_contexts(struct bytecode_runtime *bytecode,
 	node = cds_lfht_iter_get_node(&iter);
 	if (node) {
 		mp_node = caa_container_of(node, struct lfht_mp_node, node);
-		
+
 		dbg_printf("Filter: validate merge point at offset %lu\n",
 				target_pc);
 		if (merge_points_compare(stack, &mp_node->stack)) {
@@ -870,26 +1173,25 @@ int validate_instruction_all_contexts(struct bytecode_runtime *bytecode,
 }
 
 /*
+ * Validate load instructions: specialized instructions not accepted as input.
+ *
  * Return value:
  * >0: going to next insn.
  * 0: success, stop iteration.
  * <0: error
  */
 static
-int exec_insn(struct bytecode_runtime *bytecode,
-		struct cds_lfht *merge_points,
-		struct vstack *stack,
-		char **_next_pc,
+int validate_load(char **_next_pc,
 		char *pc)
 {
-	int ret = 1;
+	int ret = 0;
 	char *next_pc = *_next_pc;
 
 	switch (*(filter_opcode_t *) pc) {
 	case FILTER_OP_UNKNOWN:
 	default:
 	{
-		ERR("unknown bytecode op %u\n",
+		ERR("Unknown bytecode op %u\n",
 			(unsigned int) *(filter_opcode_t *) pc);
 		ret = -EINVAL;
 		goto end;
@@ -897,13 +1199,14 @@ int exec_insn(struct bytecode_runtime *bytecode,
 
 	case FILTER_OP_RETURN:
 	{
-		if (!vstack_ax(stack)) {
-			ERR("Empty stack\n");
-			ret = -EINVAL;
-			goto end;
-		}
-		ret = 0;
-		goto end;
+		next_pc += sizeof(struct return_op);
+		break;
+	}
+
+	case FILTER_OP_RETURN_S64:
+	{
+		next_pc += sizeof(struct return_op);
+		break;
 	}
 
 	/* binary */
@@ -912,13 +1215,8 @@ int exec_insn(struct bytecode_runtime *bytecode,
 	case FILTER_OP_MOD:
 	case FILTER_OP_PLUS:
 	case FILTER_OP_MINUS:
-	case FILTER_OP_RSHIFT:
-	case FILTER_OP_LSHIFT:
-	case FILTER_OP_BIN_AND:
-	case FILTER_OP_BIN_OR:
-	case FILTER_OP_BIN_XOR:
 	{
-		ERR("unsupported bytecode op %u\n",
+		ERR("Unsupported bytecode op %u\n",
 			(unsigned int) *(filter_opcode_t *) pc);
 		ret = -EINVAL;
 		goto end;
@@ -936,6 +1234,8 @@ int exec_insn(struct bytecode_runtime *bytecode,
 	case FILTER_OP_LT_STRING:
 	case FILTER_OP_GE_STRING:
 	case FILTER_OP_LE_STRING:
+	case FILTER_OP_EQ_STAR_GLOB_STRING:
+	case FILTER_OP_NE_STAR_GLOB_STRING:
 	case FILTER_OP_EQ_S64:
 	case FILTER_OP_NE_S64:
 	case FILTER_OP_GT_S64:
@@ -960,18 +1260,12 @@ int exec_insn(struct bytecode_runtime *bytecode,
 	case FILTER_OP_LT_S64_DOUBLE:
 	case FILTER_OP_GE_S64_DOUBLE:
 	case FILTER_OP_LE_S64_DOUBLE:
+	case FILTER_OP_BIT_RSHIFT:
+	case FILTER_OP_BIT_LSHIFT:
+	case FILTER_OP_BIT_AND:
+	case FILTER_OP_BIT_OR:
+	case FILTER_OP_BIT_XOR:
 	{
-		/* Pop 2, push 1 */
-		if (vstack_pop(stack)) {
-			ret = -EINVAL;
-			goto end;
-		}
-		if (!vstack_ax(stack)) {
-			ERR("Empty stack\n");
-			ret = -EINVAL;
-			goto end;
-		}
-		vstack_ax(stack)->type = REG_S64;
 		next_pc += sizeof(struct binary_op);
 		break;
 	}
@@ -979,23 +1273,392 @@ int exec_insn(struct bytecode_runtime *bytecode,
 	/* unary */
 	case FILTER_OP_UNARY_PLUS:
 	case FILTER_OP_UNARY_MINUS:
+	case FILTER_OP_UNARY_PLUS_S64:
+	case FILTER_OP_UNARY_MINUS_S64:
+	case FILTER_OP_UNARY_NOT_S64:
+	case FILTER_OP_UNARY_NOT:
+	case FILTER_OP_UNARY_BIT_NOT:
+	case FILTER_OP_UNARY_PLUS_DOUBLE:
+	case FILTER_OP_UNARY_MINUS_DOUBLE:
+	case FILTER_OP_UNARY_NOT_DOUBLE:
 	{
-		/* Pop 1, push 1 */
-		if (!vstack_ax(stack)) {
-			ERR("Empty stack\n");
-			ret = -EINVAL;
-			goto end;
-		}
-		vstack_ax(stack)->type = REG_UNKNOWN;
 		next_pc += sizeof(struct unary_op);
 		break;
 	}
 
-	case FILTER_OP_UNARY_PLUS_S64:
-	case FILTER_OP_UNARY_MINUS_S64:
-	case FILTER_OP_UNARY_NOT:
-	case FILTER_OP_UNARY_NOT_S64:
-	case FILTER_OP_UNARY_NOT_DOUBLE:
+	/* logical */
+	case FILTER_OP_AND:
+	case FILTER_OP_OR:
+	{
+		next_pc += sizeof(struct logical_op);
+		break;
+	}
+
+	/* load field ref */
+	case FILTER_OP_LOAD_FIELD_REF:
+	/* get context ref */
+	case FILTER_OP_GET_CONTEXT_REF:
+	{
+		next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
+		break;
+	}
+	case FILTER_OP_LOAD_FIELD_REF_STRING:
+	case FILTER_OP_LOAD_FIELD_REF_SEQUENCE:
+	case FILTER_OP_GET_CONTEXT_REF_STRING:
+	case FILTER_OP_LOAD_FIELD_REF_S64:
+	case FILTER_OP_GET_CONTEXT_REF_S64:
+	case FILTER_OP_LOAD_FIELD_REF_DOUBLE:
+	case FILTER_OP_GET_CONTEXT_REF_DOUBLE:
+	{
+		/*
+		 * Reject specialized load field ref instructions.
+		 */
+		ret = -EINVAL;
+		goto end;
+	}
+
+	/* load from immediate operand */
+	case FILTER_OP_LOAD_STRING:
+	case FILTER_OP_LOAD_STAR_GLOB_STRING:
+	{
+		struct load_op *insn = (struct load_op *) pc;
+
+		next_pc += sizeof(struct load_op) + strlen(insn->data) + 1;
+		break;
+	}
+
+	case FILTER_OP_LOAD_S64:
+	{
+		next_pc += sizeof(struct load_op) + sizeof(struct literal_numeric);
+		break;
+	}
+	case FILTER_OP_LOAD_DOUBLE:
+	{
+		next_pc += sizeof(struct load_op) + sizeof(struct literal_double);
+		break;
+	}
+
+	case FILTER_OP_CAST_DOUBLE_TO_S64:
+	case FILTER_OP_CAST_TO_S64:
+	case FILTER_OP_CAST_NOP:
+	{
+		next_pc += sizeof(struct cast_op);
+		break;
+	}
+
+	/*
+	 * Instructions for recursive traversal through composed types.
+	 */
+	case FILTER_OP_GET_CONTEXT_ROOT:
+	case FILTER_OP_GET_APP_CONTEXT_ROOT:
+	case FILTER_OP_GET_PAYLOAD_ROOT:
+	case FILTER_OP_LOAD_FIELD:
+	{
+		next_pc += sizeof(struct load_op);
+		break;
+	}
+
+	case FILTER_OP_LOAD_FIELD_S8:
+	case FILTER_OP_LOAD_FIELD_S16:
+	case FILTER_OP_LOAD_FIELD_S32:
+	case FILTER_OP_LOAD_FIELD_S64:
+	case FILTER_OP_LOAD_FIELD_U8:
+	case FILTER_OP_LOAD_FIELD_U16:
+	case FILTER_OP_LOAD_FIELD_U32:
+	case FILTER_OP_LOAD_FIELD_U64:
+	case FILTER_OP_LOAD_FIELD_STRING:
+	case FILTER_OP_LOAD_FIELD_SEQUENCE:
+	case FILTER_OP_LOAD_FIELD_DOUBLE:
+	{
+		/*
+		 * Reject specialized load field instructions.
+		 */
+		ret = -EINVAL;
+		goto end;
+	}
+
+	case FILTER_OP_GET_SYMBOL:
+	case FILTER_OP_GET_SYMBOL_FIELD:
+	{
+		next_pc += sizeof(struct load_op) + sizeof(struct get_symbol);
+		break;
+	}
+
+	case FILTER_OP_GET_INDEX_U16:
+	{
+		next_pc += sizeof(struct load_op) + sizeof(struct get_index_u16);
+		break;
+	}
+
+	case FILTER_OP_GET_INDEX_U64:
+	{
+		next_pc += sizeof(struct load_op) + sizeof(struct get_index_u64);
+		break;
+	}
+
+	}
+end:
+	*_next_pc = next_pc;
+	return ret;
+}
+
+/*
+ * Return value:
+ * >0: going to next insn.
+ * 0: success, stop iteration.
+ * <0: error
+ */
+static
+int exec_insn(struct bytecode_runtime *bytecode,
+		struct cds_lfht *merge_points,
+		struct vstack *stack,
+		char **_next_pc,
+		char *pc)
+{
+	int ret = 1;
+	char *next_pc = *_next_pc;
+
+	switch (*(filter_opcode_t *) pc) {
+	case FILTER_OP_UNKNOWN:
+	default:
+	{
+		ERR("unknown bytecode op %u\n",
+			(unsigned int) *(filter_opcode_t *) pc);
+		ret = -EINVAL;
+		goto end;
+	}
+
+	case FILTER_OP_RETURN:
+	{
+		if (!vstack_ax(stack)) {
+			ERR("Empty stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		switch (vstack_ax(stack)->type) {
+		case REG_S64:
+		case REG_UNKNOWN:
+			break;
+		default:
+			ERR("Unexpected register type %d at end of bytecode\n",
+				(int) vstack_ax(stack)->type);
+			ret = -EINVAL;
+			goto end;
+		}
+
+		ret = 0;
+		goto end;
+	}
+	case FILTER_OP_RETURN_S64:
+	{
+		if (!vstack_ax(stack)) {
+			ERR("Empty stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		switch (vstack_ax(stack)->type) {
+		case REG_S64:
+			break;
+		default:
+		case REG_UNKNOWN:
+			ERR("Unexpected register type %d at end of bytecode\n",
+				(int) vstack_ax(stack)->type);
+			ret = -EINVAL;
+			goto end;
+		}
+
+		ret = 0;
+		goto end;
+	}
+
+	/* binary */
+	case FILTER_OP_MUL:
+	case FILTER_OP_DIV:
+	case FILTER_OP_MOD:
+	case FILTER_OP_PLUS:
+	case FILTER_OP_MINUS:
+	{
+		ERR("unsupported bytecode op %u\n",
+			(unsigned int) *(filter_opcode_t *) pc);
+		ret = -EINVAL;
+		goto end;
+	}
+
+	case FILTER_OP_EQ:
+	case FILTER_OP_NE:
+	case FILTER_OP_GT:
+	case FILTER_OP_LT:
+	case FILTER_OP_GE:
+	case FILTER_OP_LE:
+	case FILTER_OP_EQ_STRING:
+	case FILTER_OP_NE_STRING:
+	case FILTER_OP_GT_STRING:
+	case FILTER_OP_LT_STRING:
+	case FILTER_OP_GE_STRING:
+	case FILTER_OP_LE_STRING:
+	case FILTER_OP_EQ_STAR_GLOB_STRING:
+	case FILTER_OP_NE_STAR_GLOB_STRING:
+	case FILTER_OP_EQ_S64:
+	case FILTER_OP_NE_S64:
+	case FILTER_OP_GT_S64:
+	case FILTER_OP_LT_S64:
+	case FILTER_OP_GE_S64:
+	case FILTER_OP_LE_S64:
+	case FILTER_OP_EQ_DOUBLE:
+	case FILTER_OP_NE_DOUBLE:
+	case FILTER_OP_GT_DOUBLE:
+	case FILTER_OP_LT_DOUBLE:
+	case FILTER_OP_GE_DOUBLE:
+	case FILTER_OP_LE_DOUBLE:
+	case FILTER_OP_EQ_DOUBLE_S64:
+	case FILTER_OP_NE_DOUBLE_S64:
+	case FILTER_OP_GT_DOUBLE_S64:
+	case FILTER_OP_LT_DOUBLE_S64:
+	case FILTER_OP_GE_DOUBLE_S64:
+	case FILTER_OP_LE_DOUBLE_S64:
+	case FILTER_OP_EQ_S64_DOUBLE:
+	case FILTER_OP_NE_S64_DOUBLE:
+	case FILTER_OP_GT_S64_DOUBLE:
+	case FILTER_OP_LT_S64_DOUBLE:
+	case FILTER_OP_GE_S64_DOUBLE:
+	case FILTER_OP_LE_S64_DOUBLE:
+	case FILTER_OP_BIT_RSHIFT:
+	case FILTER_OP_BIT_LSHIFT:
+	case FILTER_OP_BIT_AND:
+	case FILTER_OP_BIT_OR:
+	case FILTER_OP_BIT_XOR:
+	{
+		/* Pop 2, push 1 */
+		if (vstack_pop(stack)) {
+			ret = -EINVAL;
+			goto end;
+		}
+		if (!vstack_ax(stack)) {
+			ERR("Empty stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		switch (vstack_ax(stack)->type) {
+		case REG_S64:
+		case REG_DOUBLE:
+		case REG_STRING:
+		case REG_STAR_GLOB_STRING:
+		case REG_UNKNOWN:
+			break;
+		default:
+			ERR("Unexpected register type %d for operation\n",
+				(int) vstack_ax(stack)->type);
+			ret = -EINVAL;
+			goto end;
+		}
+
+		vstack_ax(stack)->type = REG_S64;
+		next_pc += sizeof(struct binary_op);
+		break;
+	}
+
+	/* unary */
+	case FILTER_OP_UNARY_PLUS:
+	case FILTER_OP_UNARY_MINUS:
+	{
+		/* Pop 1, push 1 */
+		if (!vstack_ax(stack)) {
+			ERR("Empty stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		switch (vstack_ax(stack)->type) {
+		case REG_UNKNOWN:
+		case REG_DOUBLE:
+		case REG_S64:
+			break;
+		default:
+			ERR("Unexpected register type %d for operation\n",
+				(int) vstack_ax(stack)->type);
+			ret = -EINVAL;
+			goto end;
+		}
+		vstack_ax(stack)->type = REG_UNKNOWN;
+		next_pc += sizeof(struct unary_op);
+		break;
+	}
+
+	case FILTER_OP_UNARY_PLUS_S64:
+	case FILTER_OP_UNARY_MINUS_S64:
+	case FILTER_OP_UNARY_NOT_S64:
+	{
+		/* Pop 1, push 1 */
+		if (!vstack_ax(stack)) {
+			ERR("Empty stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		switch (vstack_ax(stack)->type) {
+		case REG_S64:
+			break;
+		default:
+			ERR("Unexpected register type %d for operation\n",
+				(int) vstack_ax(stack)->type);
+			ret = -EINVAL;
+			goto end;
+		}
+
+		vstack_ax(stack)->type = REG_S64;
+		next_pc += sizeof(struct unary_op);
+		break;
+	}
+
+	case FILTER_OP_UNARY_NOT:
+	{
+		/* Pop 1, push 1 */
+		if (!vstack_ax(stack)) {
+			ERR("Empty stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		switch (vstack_ax(stack)->type) {
+		case REG_UNKNOWN:
+		case REG_DOUBLE:
+		case REG_S64:
+			break;
+		default:
+			ERR("Unexpected register type %d for operation\n",
+				(int) vstack_ax(stack)->type);
+			ret = -EINVAL;
+			goto end;
+		}
+
+		vstack_ax(stack)->type = REG_S64;
+		next_pc += sizeof(struct unary_op);
+		break;
+	}
+
+	case FILTER_OP_UNARY_BIT_NOT:
+	{
+		/* Pop 1, push 1 */
+		if (!vstack_ax(stack)) {
+			ERR("Empty stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		switch (vstack_ax(stack)->type) {
+		case REG_UNKNOWN:
+		case REG_S64:
+			break;
+		case REG_DOUBLE:
+		default:
+			ERR("Unexpected register type %d for operation\n",
+				(int) vstack_ax(stack)->type);
+			ret = -EINVAL;
+			goto end;
+		}
+
+		vstack_ax(stack)->type = REG_S64;
+		next_pc += sizeof(struct unary_op);
+		break;
+	}
+
+	case FILTER_OP_UNARY_NOT_DOUBLE:
 	{
 		/* Pop 1, push 1 */
 		if (!vstack_ax(stack)) {
@@ -1003,6 +1666,16 @@ int exec_insn(struct bytecode_runtime *bytecode,
 			ret = -EINVAL;
 			goto end;
 		}
+		switch (vstack_ax(stack)->type) {
+		case REG_DOUBLE:
+			break;
+		default:
+			ERR("Incorrect register type %d for operation\n",
+				(int) vstack_ax(stack)->type);
+			ret = -EINVAL;
+			goto end;
+		}
+
 		vstack_ax(stack)->type = REG_S64;
 		next_pc += sizeof(struct unary_op);
 		break;
@@ -1017,6 +1690,16 @@ int exec_insn(struct bytecode_runtime *bytecode,
 			ret = -EINVAL;
 			goto end;
 		}
+		switch (vstack_ax(stack)->type) {
+		case REG_DOUBLE:
+			break;
+		default:
+			ERR("Incorrect register type %d for operation\n",
+				(int) vstack_ax(stack)->type);
+			ret = -EINVAL;
+			goto end;
+		}
+
 		vstack_ax(stack)->type = REG_DOUBLE;
 		next_pc += sizeof(struct unary_op);
 		break;
@@ -1036,6 +1719,23 @@ int exec_insn(struct bytecode_runtime *bytecode,
 			ret = merge_ret;
 			goto end;
 		}
+
+		if (!vstack_ax(stack)) {
+			ERR("Empty stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		/* There is always a cast-to-s64 operation before a or/and op. */
+		switch (vstack_ax(stack)->type) {
+		case REG_S64:
+			break;
+		default:
+			ERR("Incorrect register type %d for operation\n",
+				(int) vstack_ax(stack)->type);
+			ret = -EINVAL;
+			goto end;
+		}
+
 		/* Continue to next instruction */
 		/* Pop 1 when jump not taken */
 		if (vstack_pop(stack)) {
@@ -1113,6 +1813,19 @@ int exec_insn(struct bytecode_runtime *bytecode,
 		break;
 	}
 
+	case FILTER_OP_LOAD_STAR_GLOB_STRING:
+	{
+		struct load_op *insn = (struct load_op *) pc;
+
+		if (vstack_push(stack)) {
+			ret = -EINVAL;
+			goto end;
+		}
+		vstack_ax(stack)->type = REG_STAR_GLOB_STRING;
+		next_pc += sizeof(struct load_op) + strlen(insn->data) + 1;
+		break;
+	}
+
 	case FILTER_OP_LOAD_S64:
 	{
 		if (vstack_push(stack)) {
@@ -1146,6 +1859,17 @@ int exec_insn(struct bytecode_runtime *bytecode,
 			ret = -EINVAL;
 			goto end;
 		}
+		switch (vstack_ax(stack)->type) {
+		case REG_S64:
+		case REG_DOUBLE:
+		case REG_UNKNOWN:
+			break;
+		default:
+			ERR("Incorrect register type %d for cast\n",
+				(int) vstack_ax(stack)->type);
+			ret = -EINVAL;
+			goto end;
+		}
 		vstack_ax(stack)->type = REG_S64;
 		next_pc += sizeof(struct cast_op);
 		break;
@@ -1156,12 +1880,186 @@ int exec_insn(struct bytecode_runtime *bytecode,
 		break;
 	}
 
+	/*
+	 * Instructions for recursive traversal through composed types.
+	 */
+	case FILTER_OP_GET_CONTEXT_ROOT:
+	case FILTER_OP_GET_APP_CONTEXT_ROOT:
+	case FILTER_OP_GET_PAYLOAD_ROOT:
+	{
+		if (vstack_push(stack)) {
+			ret = -EINVAL;
+			goto end;
+		}
+		vstack_ax(stack)->type = REG_PTR;
+		next_pc += sizeof(struct load_op);
+		break;
+	}
+
+	case FILTER_OP_LOAD_FIELD:
+	{
+		/* Pop 1, push 1 */
+		if (!vstack_ax(stack)) {
+			ERR("Empty stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		if (vstack_ax(stack)->type != REG_PTR) {
+			ERR("Expecting pointer on top of stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		vstack_ax(stack)->type = REG_UNKNOWN;
+		next_pc += sizeof(struct load_op);
+		break;
+	}
+
+	case FILTER_OP_LOAD_FIELD_S8:
+	case FILTER_OP_LOAD_FIELD_S16:
+	case FILTER_OP_LOAD_FIELD_S32:
+	case FILTER_OP_LOAD_FIELD_S64:
+	case FILTER_OP_LOAD_FIELD_U8:
+	case FILTER_OP_LOAD_FIELD_U16:
+	case FILTER_OP_LOAD_FIELD_U32:
+	case FILTER_OP_LOAD_FIELD_U64:
+	{
+		/* Pop 1, push 1 */
+		if (!vstack_ax(stack)) {
+			ERR("Empty stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		if (vstack_ax(stack)->type != REG_PTR) {
+			ERR("Expecting pointer on top of stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		vstack_ax(stack)->type = REG_S64;
+		next_pc += sizeof(struct load_op);
+		break;
+	}
+
+	case FILTER_OP_LOAD_FIELD_STRING:
+	case FILTER_OP_LOAD_FIELD_SEQUENCE:
+	{
+		/* Pop 1, push 1 */
+		if (!vstack_ax(stack)) {
+			ERR("Empty stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		if (vstack_ax(stack)->type != REG_PTR) {
+			ERR("Expecting pointer on top of stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		vstack_ax(stack)->type = REG_STRING;
+		next_pc += sizeof(struct load_op);
+		break;
+	}
+
+	case FILTER_OP_LOAD_FIELD_DOUBLE:
+	{
+		/* Pop 1, push 1 */
+		if (!vstack_ax(stack)) {
+			ERR("Empty stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		if (vstack_ax(stack)->type != REG_PTR) {
+			ERR("Expecting pointer on top of stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		vstack_ax(stack)->type = REG_DOUBLE;
+		next_pc += sizeof(struct load_op);
+		break;
+	}
+
+	case FILTER_OP_GET_SYMBOL:
+	case FILTER_OP_GET_SYMBOL_FIELD:
+	{
+		/* Pop 1, push 1 */
+		if (!vstack_ax(stack)) {
+			ERR("Empty stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		if (vstack_ax(stack)->type != REG_PTR) {
+			ERR("Expecting pointer on top of stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		next_pc += sizeof(struct load_op) + sizeof(struct get_symbol);
+		break;
+	}
+
+	case FILTER_OP_GET_INDEX_U16:
+	{
+		/* Pop 1, push 1 */
+		if (!vstack_ax(stack)) {
+			ERR("Empty stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		if (vstack_ax(stack)->type != REG_PTR) {
+			ERR("Expecting pointer on top of stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		next_pc += sizeof(struct load_op) + sizeof(struct get_index_u16);
+		break;
+	}
+
+	case FILTER_OP_GET_INDEX_U64:
+	{
+		/* Pop 1, push 1 */
+		if (!vstack_ax(stack)) {
+			ERR("Empty stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		if (vstack_ax(stack)->type != REG_PTR) {
+			ERR("Expecting pointer on top of stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		next_pc += sizeof(struct load_op) + sizeof(struct get_index_u64);
+		break;
+	}
+
 	}
 end:
 	*_next_pc = next_pc;
 	return ret;
 }
 
+int lttng_filter_validate_bytecode_load(struct bytecode_runtime *bytecode)
+{
+	char *pc, *next_pc, *start_pc;
+	int ret = -EINVAL;
+
+	start_pc = &bytecode->code[0];
+	for (pc = next_pc = start_pc; pc - start_pc < bytecode->len;
+			pc = next_pc) {
+		ret = bytecode_validate_overflow(bytecode, start_pc, pc);
+		if (ret != 0) {
+			if (ret == -ERANGE)
+				ERR("filter bytecode overflow\n");
+			goto end;
+		}
+		dbg_printf("Validating loads: op %s (%u)\n",
+			print_op((unsigned int) *(filter_opcode_t *) pc),
+			(unsigned int) *(filter_opcode_t *) pc);
+
+		ret = validate_load(&next_pc, pc);
+		if (ret)
+			goto end;
+	}
+end:
+	return ret;
+}
+
 /*
  * Never called concurrently (hash seed is shared).
  */
@@ -1191,7 +2089,7 @@ int lttng_filter_validate_bytecode(struct bytecode_runtime *bytecode)
 		ERR("Error allocating hash table for bytecode validation\n");
 		return -ENOMEM;
 	}
-	start_pc = &bytecode->data[0];
+	start_pc = &bytecode->code[0];
 	for (pc = next_pc = start_pc; pc - start_pc < bytecode->len;
 			pc = next_pc) {
 		ret = bytecode_validate_overflow(bytecode, start_pc, pc);