X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-filter-validator.c;h=a4ca777563fa9ca13e85281500b1f3db17de4d4f;hb=e0407e483deb67b6f8617d7100278c97313a9914;hp=c7b81bb6bbd193187434bd5f2b5f21a48f3fff7a;hpb=e16c054bb621df50a1710dcd9d1d613f13ef52d2;p=lttng-modules.git

diff --git a/lttng-filter-validator.c b/lttng-filter-validator.c
index c7b81bb6..a4ca7775 100644
--- a/lttng-filter-validator.c
+++ b/lttng-filter-validator.c
@@ -303,6 +303,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)) {
@@ -513,6 +514,7 @@ int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
 		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;
@@ -586,6 +588,7 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
 	}
 
 	case FILTER_OP_RETURN:
+	case FILTER_OP_RETURN_S64:
 	{
 		goto end;
 	}
@@ -1183,6 +1186,28 @@ int exec_insn(struct bytecode_runtime *bytecode,
 		goto end;
 	}
 
+	case FILTER_OP_RETURN_S64:
+	{
+		if (!vstack_ax(stack)) {
+			printk(KERN_WARNING "Empty stack\n");
+			ret = -EINVAL;
+			goto end;
+		}
+		switch (vstack_ax(stack)->type) {
+		case REG_S64:
+			break;
+		default:
+		case REG_TYPE_UNKNOWN:
+			printk(KERN_WARNING "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: