len = stacka->top + 1;
assert(len >= 0);
for (i = 0; i < len; i++) {
- if (stacka->e[i].type != stackb->e[i].type)
+ if (stacka->e[i].type != REG_UNKNOWN
+ && stackb->e[i].type != REG_UNKNOWN
+ && stacka->e[i].type != stackb->e[i].type)
return 1;
}
return 0;
/*
* Binary comparators 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_compare_check(struct vstack *stack, const char *str)
{
if (unlikely(!vstack_ax(stack) || !vstack_bx(stack)))
- goto error_unknown;
+ goto error_empty;
switch (vstack_ax(stack)->type) {
default:
- goto error_unknown;
+ goto error_type;
+ case REG_UNKNOWN:
+ goto unknown;
case REG_STRING:
switch (vstack_bx(stack)->type) {
default:
- goto error_unknown;
+ goto error_type;
+ case REG_UNKNOWN:
+ goto unknown;
case REG_STRING:
break;
case REG_S64:
case REG_DOUBLE:
switch (vstack_bx(stack)->type) {
default:
- goto error_unknown;
+ goto error_type;
+ case REG_UNKNOWN:
+ goto unknown;
case REG_STRING:
goto error_mismatch;
-
case REG_S64:
case REG_DOUBLE:
break;
}
return 0;
-error_unknown:
- return -EINVAL;
+unknown:
+ return 1;
error_mismatch:
ERR("type mismatch for '%s' binary operator\n", str);
return -EINVAL;
+
+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;
}
/*
{
if (unlikely(pc + sizeof(struct return_op)
> start_pc + bytecode->len)) {
- ret = -EINVAL;
+ ret = -ERANGE;
}
break;
}
{
if (unlikely(pc + sizeof(struct binary_op)
> start_pc + bytecode->len)) {
- ret = -EINVAL;
+ ret = -ERANGE;
}
break;
}
{
if (unlikely(pc + sizeof(struct unary_op)
> start_pc + bytecode->len)) {
- ret = -EINVAL;
+ ret = -ERANGE;
}
break;
}
{
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:
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;
if (unlikely(pc + sizeof(struct load_op)
> start_pc + bytecode->len)) {
- ret = -EINVAL;
+ ret = -ERANGE;
break;
}
str_len = strnlen(insn->data, maxlen);
if (unlikely(str_len >= maxlen)) {
/* Final '\0' not found within range */
- ret = -EINVAL;
+ ret = -ERANGE;
}
break;
}
{
if (unlikely(pc + sizeof(struct load_op) + sizeof(struct literal_numeric)
> start_pc + bytecode->len)) {
- ret = -EINVAL;
+ ret = -ERANGE;
}
break;
}
{
if (unlikely(pc + sizeof(struct load_op) + sizeof(struct literal_double)
> start_pc + bytecode->len)) {
- ret = -EINVAL;
+ ret = -ERANGE;
}
break;
}
{
if (unlikely(pc + sizeof(struct cast_op)
> start_pc + bytecode->len)) {
- ret = -EINVAL;
+ ret = -ERANGE;
}
break;
}
+
}
return ret;
/*
* Return value:
- * 0: success
+ * >=0: success
* <0: error
*/
static
case FILTER_OP_EQ:
{
ret = bin_op_compare_check(stack, "==");
- if (ret)
+ if (ret < 0)
goto end;
break;
}
case FILTER_OP_NE:
{
ret = bin_op_compare_check(stack, "!=");
- if (ret)
+ if (ret < 0)
goto end;
break;
}
case FILTER_OP_GT:
{
ret = bin_op_compare_check(stack, ">");
- if (ret)
+ if (ret < 0)
goto end;
break;
}
case FILTER_OP_LT:
{
ret = bin_op_compare_check(stack, "<");
- if (ret)
+ if (ret < 0)
goto end;
break;
}
case FILTER_OP_GE:
{
ret = bin_op_compare_check(stack, ">=");
- if (ret)
+ if (ret < 0)
goto end;
break;
}
case FILTER_OP_LE:
{
ret = bin_op_compare_check(stack, "<=");
- if (ret)
+ if (ret < 0)
goto end;
break;
}
break;
case REG_DOUBLE:
break;
+ case REG_UNKNOWN:
+ break;
}
break;
}
ret = -EINVAL;
goto end;
}
- if (vstack_ax(stack)->type != REG_S64) {
- ERR("Logical comparator expects S64 register\n");
+ if (vstack_ax(stack)->type != REG_S64
+ && vstack_ax(stack)->type != REG_UNKNOWN) {
+ ERR("Logical comparator expects S64 or dynamic register\n");
ret = -EINVAL;
goto end;
}
break;
}
- /* load */
+ /* load field ref */
case FILTER_OP_LOAD_FIELD_REF:
{
ERR("Unknown field ref type\n");
break;
}
+ /* load from immediate operand */
case FILTER_OP_LOAD_STRING:
{
break;
break;
case REG_DOUBLE:
break;
+ case REG_UNKNOWN:
+ break;
}
if (insn->op == FILTER_OP_CAST_DOUBLE_TO_S64) {
if (vstack_ax(stack)->type != REG_DOUBLE) {
break;
}
+ /* get context ref */
+ case FILTER_OP_GET_CONTEXT_REF:
+ {
+ 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 dynamic\n",
+ ref->offset);
+ break;
+ }
+ 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;
/* Validate the context resulting from the previous instruction */
ret = validate_instruction_context(bytecode, stack, start_pc, pc);
- if (ret)
+ if (ret < 0)
return ret;
/* Validate merge points */
/* unary */
case FILTER_OP_UNARY_PLUS:
case FILTER_OP_UNARY_MINUS:
- case FILTER_OP_UNARY_NOT:
+ {
+ /* 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:
{
/* Pop 1, push 1 */
if (!vstack_ax(stack)) {
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)) {
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:
+ {
+ if (vstack_push(stack)) {
+ ret = -EINVAL;
+ goto end;
+ }
+ vstack_ax(stack)->type = REG_UNKNOWN;
+ 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:
{
if (vstack_push(stack)) {
ret = -EINVAL;
break;
}
case FILTER_OP_LOAD_FIELD_REF_S64:
+ case FILTER_OP_GET_CONTEXT_REF_S64:
{
if (vstack_push(stack)) {
ret = -EINVAL;
break;
}
case FILTER_OP_LOAD_FIELD_REF_DOUBLE:
+ case FILTER_OP_GET_CONTEXT_REF_DOUBLE:
{
if (vstack_push(stack)) {
ret = -EINVAL;
break;
}
+ /* load from immediate operand */
case FILTER_OP_LOAD_STRING:
{
struct load_op *insn = (struct load_op *) pc;
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",
/*
* For each instruction, validate the current context
* (traversal of entire execution flow), and validate
- * all merge points targeting this instruction.
+ * all merge points targeting this instruction.
*/
ret = validate_instruction_all_contexts(bytecode, merge_points,
&stack, start_pc, pc);