netlink_delinearize: do not transfer binary operation to non-anonymous sets
Pablo Neira Ayuso
maintainerPATCH 1/1 netlink_delinearize: do not transfer binary operation to non-anonymous sets
Michael Braun says:
This results for nft list ruleset in
nft: netlink_delinearize.c:1945: binop_adjust_one: Assertion `value->len >= binop->right->len' failed.
This is due to binop_adjust_one setting value->len to left->len, which is shorther than right->len.
Additionally, it does not seem correct to alter set elements from parsing a rule, so remove that part all together.
Reported-by Michael Braun <[email protected]>
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
To address:
https://patchwork.ozlabs.org/project/netfilter-devel/patch/[email protected]/
src/netlink_delinearize.c | 3 +++ .../testcases/sets/dumps/typeof_sets_1.nft | 15 +++++++++++++ tests/shell/testcases/sets/typeof_sets_1 | 22 +++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 tests/shell/testcases/sets/dumps/typeof_sets_1.nft create mode 100755 tests/shell/testcases/sets/typeof_sets_1
src/netlink_delinearize.c +3 -0
@@ -2228,6 +2228,9 @@ static void binop_adjust(const struct expr *binop, struct expr *right,binop_adjust_one (binop, right, shift);break ;case EXPR_SET_REF : +if (!set_is_anonymous (right->set->flags)) +break ; +list_for_each_entry (i, &right->set->init->expressions, list) {switch (i->key->etype) {case EXPR_VALUE :
tests/shell/testcases/sets/dumps/typeof_sets_1.nft new file +15 -0
@@ -0,0 +1,15 @@ +table bridge t { + set nodhcpvlan { + typeof vlan id + elements = { 1 } + } + + chain c1 { + vlan id != @nodhcpvlan vlan type arp counter packets 0 bytes 0 jump c2 + vlan id != @nodhcpvlan vlan type ip counter packets 0 bytes 0 jump c2 + vlan id != { 1, 2 } vlan type ip6 counter packets 0 bytes 0 jump c2 + } + + chain c2 { + } +}
tests/shell/testcases/sets/typeof_sets_1 new file +22 -0
@@ -0,0 +1,22 @@ +#!/bin/bash + +# regression test for corner case in netlink_delinearize + +EXPECTED="table bridge t { + set nodhcpvlan { + typeof vlan id + elements = { 1 } + } + + chain c1 { + vlan id != @nodhcpvlan vlan type arp counter packets 0 bytes 0 jump c2 + vlan id != @nodhcpvlan vlan type ip counter packets 0 bytes 0 jump c2 + vlan id != { 1, 2 } vlan type ip6 counter packets 0 bytes 0 jump c2 + } + + chain c2 { + } +}" + +set -e +$NFT -f - <<< $EXPECTED
Signature · 1 line
2.30.2