evaluate: handle invalid mapping expressions in stateful object statements gracefully.

commit 52a7af9bec15a4fb4bfea86e40b70f96098f7dfd upstream.

Currently, they are reported as assertion failures:

  BUG: invalid mapping expression variable
  nft: src/evaluate.c:4618: stmt_evaluate_objref_map: Assertion `0' failed.
  Aborted

Instead, report them more informatively as errors:

  /space/azazel/tmp/ruleset.1067161.nft:15:29-38: Error: invalid mapping expression variable
      quota name ip saddr map $quota_map
                 ~~~~~~~~     ^^^^^^^^^^

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/evaluate.c b/src/evaluate.c
index 3ec0b1c052e7efd6b97843af8388c81715a22c97..f703cc532ee2fc618de5f41f82e96527051934ad 100644 (file)
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -4403,8 +4403,9 @@ static int stmt_evaluate_objref_map(struct eval_ctx *ctx, struct stmt *stmt)
                                          "Expression is not a map with objects");
                break;
        default:
-               BUG("invalid mapping expression %s\n",
-                   expr_name(map->mappings));
+               return expr_binary_error(ctx->msgs, map->mappings, map->map,
+                                        "invalid mapping expression %s",
+                                        expr_name(map->mappings));
        }
 
        if (!datatype_compatible(map->mappings->set->key->dtype, map->map->dtype))