X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-filter-validator.c;h=6cdfd8c164764e075bab11a5cb8234c51765890f;hb=refs%2Fheads%2Fstable-2.2;hp=4e257f5d9b969558f29e15dfcd34d3ea0e33dd85;hpb=dbea82ec5429aa713b029dfdfaf2fcff5287321d;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-filter-validator.c b/liblttng-ust/lttng-filter-validator.c
index 4e257f5d..6cdfd8c1 100644
--- a/liblttng-ust/lttng-filter-validator.c
+++ b/liblttng-ust/lttng-filter-validator.c
@@ -190,7 +190,7 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 	{
 		if (unlikely(pc + sizeof(struct return_op)
 				> start_pc + bytecode->len)) {
-			ret = -EINVAL;
+			ret = -ERANGE;
 		}
 		break;
 	}
@@ -252,7 +252,7 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 	{
 		if (unlikely(pc + sizeof(struct binary_op)
 				> start_pc + bytecode->len)) {
-			ret = -EINVAL;
+			ret = -ERANGE;
 		}
 		break;
 	}
@@ -270,7 +270,7 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 	{
 		if (unlikely(pc + sizeof(struct unary_op)
 				> start_pc + bytecode->len)) {
-			ret = -EINVAL;
+			ret = -ERANGE;
 		}
 		break;
 	}
@@ -281,30 +281,41 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 	{
 		if (unlikely(pc + sizeof(struct logical_op)
 				> start_pc + bytecode->len)) {
-			ret = -EINVAL;
+			ret = -ERANGE;
 		}
 		break;
 	}
 
-	/* load */
+	/* load field 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:
+	{
+		ERR("Unknown field ref type\n");
+		ret = -EINVAL;
+		break;
+	}
 	case FILTER_OP_LOAD_FIELD_REF_STRING:
 	case FILTER_OP_LOAD_FIELD_REF_SEQUENCE:
 	case FILTER_OP_LOAD_FIELD_REF_S64:
 	case FILTER_OP_LOAD_FIELD_REF_DOUBLE:
+	case FILTER_OP_GET_CONTEXT_REF_STRING:
+	case FILTER_OP_GET_CONTEXT_REF_S64:
+	case FILTER_OP_GET_CONTEXT_REF_DOUBLE:
 	{
 		if (unlikely(pc + sizeof(struct load_op) + sizeof(struct field_ref)
 				> start_pc + bytecode->len)) {
-			ret = -EINVAL;
+			ret = -ERANGE;
 		}
 		break;
 	}
 
+	/* load from immediate operand */
 	case FILTER_OP_LOAD_STRING:
 	{
 		struct load_op *insn = (struct load_op *) pc;
@@ -312,7 +323,7 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 
 		if (unlikely(pc + sizeof(struct load_op)
 				> start_pc + bytecode->len)) {
-			ret = -EINVAL;
+			ret = -ERANGE;
 			break;
 		}
 
@@ -320,7 +331,7 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 		str_len = strnlen(insn->data, maxlen);
 		if (unlikely(str_len >= maxlen)) {
 			/* Final '\0' not found within range */
-			ret = -EINVAL;
+			ret = -ERANGE;
 		}
 		break;
 	}
@@ -329,7 +340,7 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 	{
 		if (unlikely(pc + sizeof(struct load_op) + sizeof(struct literal_numeric)
 				> start_pc + bytecode->len)) {
-			ret = -EINVAL;
+			ret = -ERANGE;
 		}
 		break;
 	}
@@ -338,7 +349,7 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 	{
 		if (unlikely(pc + sizeof(struct load_op) + sizeof(struct literal_double)
 				> start_pc + bytecode->len)) {
-			ret = -EINVAL;
+			ret = -ERANGE;
 		}
 		break;
 	}
@@ -349,10 +360,11 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 	{
 		if (unlikely(pc + sizeof(struct cast_op)
 				> start_pc + bytecode->len)) {
-			ret = -EINVAL;
+			ret = -ERANGE;
 		}
 		break;
 	}
+
 	}
 
 	return ret;
@@ -657,7 +669,7 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
 		break;
 	}
 
-	/* load */
+	/* load field ref */
 	case FILTER_OP_LOAD_FIELD_REF:
 	{
 		ERR("Unknown field ref type\n");
@@ -693,6 +705,7 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
 		break;
 	}
 
+	/* load from immediate operand */
 	case FILTER_OP_LOAD_STRING:
 	{
 		break;
@@ -747,6 +760,41 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
 		break;
 	}
 
+	/* get context ref */
+	case FILTER_OP_GET_CONTEXT_REF:
+	{
+		ERR("Unknown get context ref type\n");
+		ret = -EINVAL;
+		goto end;
+	}
+	case FILTER_OP_GET_CONTEXT_REF_STRING:
+	{
+		struct load_op *insn = (struct load_op *) pc;
+		struct field_ref *ref = (struct field_ref *) insn->data;
+
+		dbg_printf("Validate get context ref offset %u type string\n",
+			ref->offset);
+		break;
+	}
+	case FILTER_OP_GET_CONTEXT_REF_S64:
+	{
+		struct load_op *insn = (struct load_op *) pc;
+		struct field_ref *ref = (struct field_ref *) insn->data;
+
+		dbg_printf("Validate get context ref offset %u type s64\n",
+			ref->offset);
+		break;
+	}
+	case FILTER_OP_GET_CONTEXT_REF_DOUBLE:
+	{
+		struct load_op *insn = (struct load_op *) pc;
+		struct field_ref *ref = (struct field_ref *) insn->data;
+
+		dbg_printf("Validate get context ref offset %u type double\n",
+			ref->offset);
+		break;
+	}
+
 	}
 end:
 	return ret;
@@ -966,15 +1014,23 @@ int exec_insn(struct bytecode_runtime *bytecode,
 		break;
 	}
 
-	/* load */
+	/* load field ref */
 	case FILTER_OP_LOAD_FIELD_REF:
 	{
 		ERR("Unknown field ref type\n");
 		ret = -EINVAL;
 		goto end;
 	}
+	/* get context ref */
+	case FILTER_OP_GET_CONTEXT_REF:
+	{
+		ERR("Unknown get context ref type\n");
+		ret = -EINVAL;
+		goto end;
+	}
 	case FILTER_OP_LOAD_FIELD_REF_STRING:
 	case FILTER_OP_LOAD_FIELD_REF_SEQUENCE:
+	case FILTER_OP_GET_CONTEXT_REF_STRING:
 	{
 		if (vstack_push(stack)) {
 			ret = -EINVAL;
@@ -985,6 +1041,7 @@ int exec_insn(struct bytecode_runtime *bytecode,
 		break;
 	}
 	case FILTER_OP_LOAD_FIELD_REF_S64:
+	case FILTER_OP_GET_CONTEXT_REF_S64:
 	{
 		if (vstack_push(stack)) {
 			ret = -EINVAL;
@@ -995,6 +1052,7 @@ int exec_insn(struct bytecode_runtime *bytecode,
 		break;
 	}
 	case FILTER_OP_LOAD_FIELD_REF_DOUBLE:
+	case FILTER_OP_GET_CONTEXT_REF_DOUBLE:
 	{
 		if (vstack_push(stack)) {
 			ret = -EINVAL;
@@ -1005,6 +1063,7 @@ int exec_insn(struct bytecode_runtime *bytecode,
 		break;
 	}
 
+	/* load from immediate operand */
 	case FILTER_OP_LOAD_STRING:
 	{
 		struct load_op *insn = (struct load_op *) pc;
@@ -1099,9 +1158,10 @@ int lttng_filter_validate_bytecode(struct bytecode_runtime *bytecode)
 	start_pc = &bytecode->data[0];
 	for (pc = next_pc = start_pc; pc - start_pc < bytecode->len;
 			pc = next_pc) {
-		if (bytecode_validate_overflow(bytecode, start_pc, pc) != 0) {
-			ERR("filter bytecode overflow\n");
-			ret = -EINVAL;
+		ret = bytecode_validate_overflow(bytecode, start_pc, pc);
+		if (ret != 0) {
+			if (ret == -ERANGE)
+				ERR("filter bytecode overflow\n");
 			goto end;
 		}
 		dbg_printf("Validating op %s (%u)\n",