mergesort: use lhs expression when sorting concatenation
Pablo Neira Ayuso
maintainerPATCH v2 1/3 mergesort: use lhs expression when sorting concatenation
Otherwise, concatenations using binary operations hit an assertion.
# cat ruleset.nft
table inet t {
chain c {
tcp flags . tcp dport vmap { syn | ack . 80 : drop, ack . 90 : accept }
}
}
# nft -f ruleset.nft
# nft list ruleset
nft: src/mergesort.c:23: concat_expr_msort_value: Assertion `ilen > 0' failed.
AbortedInspect the left-hand size of the expression for the merge sorting.
This patch includes a new tests/shell unit file.
---
v2: add tests/shell unit file.
src/mergesort.c | 38 +++- .../maps/dumps/vmap_concat_binop.json-nft | 196 ++++++++++++++++++ .../maps/dumps/vmap_concat_binop.nft | 13 ++ tests/shell/testcases/maps/vmap_concat_binop | 19 ++ 4 files changed, 262 insertions(+), 4 deletions(-) create mode 100644 tests/shell/testcases/maps/dumps/vmap_concat_binop.json-nft create mode 100644 tests/shell/testcases/maps/dumps/vmap_concat_binop.nft create mode 100755 tests/shell/testcases/maps/vmap_concat_binop
src/mergesort.c +34 -4
@@ -12,16 +12,46 @@#include <gmputil.h> #include <list.h> +static mpz_srcptr concat_expr_msort_value_one (const struct expr *expr, +unsigned int *i_len) +{ +mpz_srcptr i_value; + +switch (expr->etype) { +case EXPR_BINOP : +case EXPR_MAPPING : +case EXPR_RANGE : + i_value = expr->left->value; + *i_len = expr->left->len; +break ; +case EXPR_VALUE : + i_value = expr->value; + *i_len = expr->len; +break ; +case EXPR_RANGE_VALUE : + i_value = expr->range.low; + *i_len = expr->len; +break ; +default : +BUG ("Unknown expression %s" ,expr_name (expr)); + } + + *i_len =div_round_up (*i_len,BITS_PER_BYTE ); + +return i_value; +} +static void concat_expr_msort_value (const struct expr *expr,mpz_t value) { -unsigned int len =0 , ilen; +unsigned int len =0 , i_len;const struct expr *i; +mpz_srcptr i_value;char data[512 ];list_for_each_entry (i, &expr_concat (expr)->expressions, list) { - ilen =div_round_up (i->len,BITS_PER_BYTE ); -mpz_export_data (data + len, i->value,BYTEORDER_BIG_ENDIAN , ilen); - len += ilen; + i_value =concat_expr_msort_value_one (i, &i_len); +mpz_export_data (data + len, i_value,BYTEORDER_BIG_ENDIAN , i_len); + len += i_len; }mpz_import_data (value, data,BYTEORDER_BIG_ENDIAN , len);
tests/shell/testcases/maps/dumps/vmap_concat_binop.json-nft new file +196 -0
196 lines not on this page · raw message
tests/shell/testcases/maps/dumps/vmap_concat_binop.nft new file +13 -0
@@ -0,0 +1,13 @@ +table ip x { + map y { + typeof tcp flags . tcp dport : verdict + elements = { syn | ack . 80 : accept, + rst . 100 : drop, + ack . 90 : drop } + } + + chain z { + tcp flags . tcp dport vmap @y + tcp flags . tcp dport vmap { syn | ack . 80 : accept, rst . 100 : drop, ack . 90 : drop } + } +}
tests/shell/testcases/maps/vmap_concat_binop new file +19 -0
@@ -0,0 +1,19 @@ +#!/bin/bash + +set -e + +RULESET="table ip x { + map y { + typeof tcp flags . tcp dport : verdict + elements = { syn | ack . 80 : accept, + ack . 90 : drop, + rst . 100 : drop } + } + + chain z { + tcp flags . tcp dport vmap @y + tcp flags . tcp dport vmap { syn | ack . 80 : accept, ack . 90 : drop, rst . 100 : drop } + } +}" + +$NFT -f - <<< $RULESET
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH 2/3 segtree: basic support for binary operations in concatenated set ranges
Use of tcp flags in concatenated set ranges such as (note the 100-110 range):
table ip x {
chain y {
tcp flags . tcp dport vmap { syn | ack . 80 : accept, ack . 90 : drop, rst . 100-110 : drop
}}
is broken when listing the ruleset:
AddressSanitizer:DEADLYSIGNAL
=================================================================
==218685==ERROR: AddressSanitizer: SEGV on unknown address 0x50b000029798 (pc 0x7f8318b8fac0 bp 0x7ffd080a4310 sp 0x7ffd080a4198 T0) ==218685==The signal is caused by a READ memory access.
#0 0x7f8318b8fac0 in __gmpz_cmp (/lib/x86_64-linux-gnu/libgmp.so.10+0x19ac0) (BuildId: dff5c2156ec812613c5e4431005c576b212dd323)
#1 0x7f83192fbc3f in concat_range_aggregate src/segtree.c:404
#2 0x7f8319240889 in netlink_list_setelems src/netlink.c:1774
#3 0x7f8319115fdd in cache_init_objects src/cache.c:1189
#4 0x7f8319116f10 in nft_cache_init src/cache.c:1266
#5 0x7f831911772b in nft_cache_update src/cache.c:1325
#6 0x7f83191eac34 in nft_evaluate src/libnftables.c:580
#7 0x7f83191eb8b6 in nft_run_cmd_from_buffer src/libnftables.c:638
#8 0x558baf3bc403 in main src/main.c:538add basic support so it works with tcp flags, add a new assertion to crash safely to ensure expression type is EXPR_VALUE before access when trying to compose the range (this code only supports EXPR_VALUE when building a range expression at this stage) and a new test.
This patch includes a new tests/shell unit file.
--- src/segtree.c | 27 ++- .../dumps/vmap_concat_range_binary.json-nft | 209 ++++++++++++++++++ .../maps/dumps/vmap_concat_range_binary.nft | 14 ++ .../testcases/maps/vmap_concat_range_binary | 22 ++ 4 files changed, 271 insertions(+), 1 deletion(-) create mode 100644 tests/shell/testcases/maps/dumps/vmap_concat_range_binary.json-nft create mode 100755 tests/shell/testcases/maps/dumps/vmap_concat_range_binary.nft create mode 100755 tests/shell/testcases/maps/vmap_concat_range_binary
src/segtree.c +26 -1
@@ -362,6 +362,29 @@ static int range_mask_len(const mpz_t start, const mpz_t end, unsigned int len)return ret; } +static int concat_expr_cmp (const struct expr *r1,const struct expr *r2) +{ +int ret; + +assert (r1->etype == r2->etype); + +switch (r1->etype) { +case EXPR_BINOP : +assert (r1->op == r2->op); + ret =0 ; + ret =mpz_cmp (r1->left->value, r2->left->value); + ret |=mpz_cmp (r1->right->value, r2->right->value); +break ; +case EXPR_VALUE : + ret =mpz_cmp (r1->value, r2->value); +break ; +default : +BUG ("unexpected expression %s" ,expr_name (r1->key)); + } + +return ret; +} +/* Given a set with two elements (start and end), transform them into a * concatenation of ranges. That is, from a list of start expressions and a list * of end expressions, form a list of start - end expressions.
@@ -401,11 +424,13 @@ void concat_range_aggregate(struct expr *set) r2_next = r2->list.next; free_r1 =0 ; -if (!mpz_cmp (r1->value, r2->value)) { +if (!concat_expr_cmp (r1, r2)) { free_r1 =1 ; goto next; } +assert (r1->etype ==EXPR_VALUE && r1->etype ==EXPR_VALUE ); +if (expr_basetype (r1)->type ==TYPE_STRING &&expr_basetype (r2)->type ==TYPE_STRING ) { string_type = true;
tests/shell/testcases/maps/dumps/vmap_concat_range_binary.json-nft new file +209 -0
209 lines not on this page · raw message
tests/shell/testcases/maps/dumps/vmap_concat_range_binary.nft new file +14 -0
@@ -0,0 +1,14 @@ +table ip x { + map y { + typeof tcp flags . tcp dport : verdict + flags interval + elements = { syn | ack . 80 : accept, + ack . 90 : drop, + rst . 100-110 : drop } + } + + chain z { + tcp flags . tcp dport vmap @y + tcp flags . tcp dport vmap { syn | ack . 80 : accept, ack . 90 : drop, rst . 100-110 : drop } + } +}
tests/shell/testcases/maps/vmap_concat_range_binary new file +22 -0
@@ -0,0 +1,22 @@ +#!/bin/bash + +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_pipapo) + +set -e + +RULESET="table ip x { + map y { + typeof tcp flags . tcp dport : verdict + flags interval + elements = { syn | ack . 80 : accept, + ack . 90 : drop, + rst . 100-110 : drop } + } + + chain z { + tcp flags . tcp dport vmap @y + tcp flags . tcp dport vmap { syn | ack . 80 : accept, ack . 90 : drop, rst . 100-110 : drop } + } +}" + +$NFT -f - <<< $RULESET
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH 3/3 tests: shell: add flush set after expiration
In reply to Pablo Neira AyusoAdd a new test to cover for flush commands after elements have expired, this allowed me to catch a bug in:
("netfilter: nf_tables: call set ops .commit when building new ruleset")
This tests works fine with <= 7.2-rc6, this is not specifically covering any existing regression.
--- .../sets/dumps/flush_after_expiration.nodump | 0 .../testcases/sets/flush_after_expiration | 45 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 tests/shell/testcases/sets/dumps/flush_after_expiration.nodump create mode 100755 tests/shell/testcases/sets/flush_after_expiration
tests/shell/testcases/sets/dumps/flush_after_expiration.nodump new file +0 -0
tests/shell/testcases/sets/flush_after_expiration new file +45 -0
45 lines not on this page · raw message
Signature · 1 line
2.47.3