Skip to content

assorted fixes

Pablo Neira Ayuso netfilter-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest4 patches 2 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/4evaluate: skip anonymous set optimization for concatenationssrc/evaluate.c+11 -90 replies
2/4evaluate: do not fetch next expression on runaway number of concatenation componentssrc/evaluate.c+2 -20 replies
3/4evaluate: bail out if anonymous concat set defines a non concat expressionsrc/evaluate.c tests/shell/testcases/bogons/nft-f/unhandled_key_type_13_assert tests/shell/testcases/bogons/nft-f/unhandled_key_type_13_assert_map +1 more+49 -10 replies
4/4Revert "datatype: do not assert when value exceeds expected width"src/datatype.c+2 -42 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH nft 0/4] assorted fixes

Hi Florian,

This in an alternative path to address the issue described here:

https://patchwork.ozlabs.org/project/netfilter-devel/patch/[email protected]/

(I am partially integrating this patch into 3/4 in this series).

Patch #1 fixes a bug in the set optimization with single elements, which
results in strange ruleset listings. Concatenations are only supported with sets, so let's just skip this.

Patch #2 do not fetch next key in case runaway flag is set on with
concatenations. I could not crash nftables with this, but I found it when reviewing this code.

Patch #3 iterate over the anonymous set in set_evaluate() to validate
consistency of elements as concat expressions. Otherwise, bail out with:

ruleset.nft:3:46-53: Error: expression is not a concatenation

               ip protocol . th dport vmap { tcp / 22 : accept, tcp . 80 : drop}
                                             ^^^^^^^^

         I extended tests to cover maps too.

I needed special error handling when set_evaluate() fails to release sets so ASAN does not complain with incorrect memory handling, this chunk:

@@ -118,7 +119,15 @@ static struct expr *implicit_set_declaration(struct eval_ctx *ctx,

                list_add_tail(&cmd->list, &ctx->cmd->list);
        }
-       set_evaluate(ctx, set);
+       err = set_evaluate(ctx, set);
+       if (err < 0) {

+ list_del(&cmd->list);
+ if (set->flags & NFT_SET_MAP)
+ cmd->set->init = NULL;
+
+ cmd_free(cmd);
+ return NULL;
+ }

        return set_ref_expr_alloc(&expr->location, set);

}

Patch #4 revert a recent late sanity check which is already covered by this
patchset.

In general the idea is to make stricter validations from evaluation phase to avoid propagating errors any further.

This passing tests/shell and tests/py, it might be a good idea to add more bogons tests for concatenations with imbalanced number of components / runaway number of components, I will follow up with a patch to extend tests infrastructure with this.

Pablo Neira Ayuso (4):
evaluate: skip anonymous set optimization for concatenations
evaluate: do not fetch next expression on runaway number of concatenation components
evaluate: bail out if anonymous concat set defines a non concat expression Revert "datatype: do not assert when value exceeds expected width"

 src/datatype.c                                |  6 +-
 src/evaluate.c                                | 59 +++++++++++++++----
 .../bogons/nft-f/unhandled_key_type_13_assert |  5 ++
 .../nft-f/unhandled_key_type_13_assert_map    |  5 ++
 .../nft-f/unhandled_key_type_13_assert_vmap   |  5 ++
 5 files changed, 64 insertions(+), 16 deletions(-)
 create mode 100644 tests/shell/testcases/bogons/nft-f/unhandled_key_type_13_assert
 create mode 100644 tests/shell/testcases/bogons/nft-f/unhandled_key_type_13_assert_map
 create mode 100644 tests/shell/testcases/bogons/nft-f/unhandled_key_type_13_assert_vmap

--
2.30.2