X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-filter-validator.c;h=92455c80a554766830dda045ccd5f73d76dc5b09;hb=93c591bb3a90753ce66197f2c1e41c8ef554506f;hp=4fe8e8938d9ccd889d47a50f8d58910c62fdf68a;hpb=0039e2d8d79c3260d29591fc10a07d57bcc535b3;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-filter-validator.c b/liblttng-ust/lttng-filter-validator.c
index 4fe8e893..92455c80 100644
--- a/liblttng-ust/lttng-filter-validator.c
+++ b/liblttng-ust/lttng-filter-validator.c
@@ -296,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)) {
@@ -578,6 +579,7 @@ int validate_instruction_context(struct bytecode_runtime *bytecode,
 	}
 
 	case FILTER_OP_RETURN:
+	case FILTER_OP_RETURN_S64:
 	{
 		goto end;
 	}
@@ -1255,6 +1257,27 @@ int exec_insn(struct bytecode_runtime *bytecode,
 		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: