evaluate: resolve_protocol_conflict() should return int

Instead of bool, expr_error() returns -1 if we fail to create
dependencies. We need to propagate this error value.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/evaluate.c b/src/evaluate.c
index 5e9783d1d8d39bf54e83ce3a8646611f62926053..7898ed429830dd2581916321369e8995f7c1ccfb 100644 (file)
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -371,8 +371,7 @@ static bool supersede_dep(const struct proto_desc *have,
        return true;
 }
 
-static bool resolve_protocol_conflict(struct eval_ctx *ctx,
-                                     struct expr *payload)
+static int resolve_protocol_conflict(struct eval_ctx *ctx, struct expr *payload)
 {
        const struct hook_proto_desc *h = &hook_proto_desc[ctx->pctx.family];
        enum proto_bases base = payload->payload.base;
@@ -381,14 +380,13 @@ static bool resolve_protocol_conflict(struct eval_ctx *ctx,
        int link;
 
        desc = ctx->pctx.protocol[base].desc;
-
        if (desc == payload->payload.desc) {
                payload->payload.offset += ctx->pctx.protocol[base].offset;
-               return true;
+               return 0;
        }
 
        if (payload->payload.base != h->base)
-               return false;
+               return 1;
 
        if (supersede_dep(desc, payload)) {
                uint16_t type;
@@ -405,7 +403,7 @@ static bool resolve_protocol_conflict(struct eval_ctx *ctx,
 
                list_add_tail(&nstmt->list, &ctx->stmt->list);
                ctx->pctx.protocol[base].desc = payload->payload.desc;
-               return true;
+               return 0;
        }
 
        if (base < PROTO_BASE_MAX) {
@@ -416,21 +414,21 @@ static bool resolve_protocol_conflict(struct eval_ctx *ctx,
                        ctx->pctx.protocol[base].desc = next;
                        ctx->pctx.protocol[base].offset += desc->length;
                        payload->payload.offset += desc->length;
-                       return true;
+                       return 0;
                } else if (next) {
-                       return false;
+                       return 1;
                }
        }
 
        link = proto_find_num(desc, payload->payload.desc);
        if (link < 0 || conflict_resolution_gen_dependency(ctx, link, payload, &nstmt) < 0)
-               return false;
+               return 1;
 
        payload->payload.offset += ctx->pctx.protocol[base].offset;
        list_add_tail(&nstmt->list, &ctx->stmt->list);
        ctx->pctx.protocol[base + 1].desc = NULL;
 
-       return true;
+       return 0;
 }
 
 /*
@@ -443,17 +441,21 @@ static int __expr_evaluate_payload(struct eval_ctx *ctx, struct expr *expr)
        struct expr *payload = expr;
        enum proto_bases base = payload->payload.base;
        struct stmt *nstmt;
+       int err;
 
        if (ctx->pctx.protocol[base].desc == NULL) {
                if (payload_gen_dependency(ctx, payload, &nstmt) < 0)
                        return -1;
                list_add_tail(&nstmt->list, &ctx->stmt->list);
-       } else if (!resolve_protocol_conflict(ctx, payload))
+       } else {
+               err = resolve_protocol_conflict(ctx, payload);
+               if (err <= 0)
+                       return err;
                return expr_error(ctx->msgs, payload,
                                  "conflicting protocols specified: %s vs. %s",
                                  ctx->pctx.protocol[base].desc->name,
                                  payload->payload.desc->name);
-
+       }
        return 0;
 }