parser_bison: restore parsing of dynamic set element updates
Pablo Neira Ayuso
maintainerPATCH 1/2 parser_bison: restore parsing of dynamic set element updates
Add a new set_elem_expr_stmt production to handle dynamic set element updates from rules.
Quickly tested this here through:
# nft add table filter
# nft add chain filter input { type filter hook input priority 0\; }
# nft add set filter myset { type inet_service\; flags timeout\; }
# nft add rule filter input set add tcp sport timeout 60s @myset
# nft list ruleset
table ip filter {
set myset {
type inet_service
flags timeout
elements = { http expires 9s}
} chain input {
type filter hook input priority 0; policy accept;
set add tcp dport timeout 1m @myset
}}
Fixes a3e60492a684 ("parser: restrict relational rhs expression recursion")
Reported-by Anders K. Pedersen <[email protected]>
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/parser_bison.y | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
src/parser_bison.y +13 -1
@@ -523,6 +523,8 @@ static void location_update(struct location *loc, struct location *rhs, int n) %destructor { expr_free($$); } set_expr set_list_expr set_list_member_expr %type <expr> set_elem_expr set_elem_expr_alloc set_lhs_expr set_rhs_expr %destructor { expr_free($$); } set_elem_expr set_elem_expr_alloc set_lhs_expr set_rhs_expr +%type <expr> set_elem_expr_stmt set_elem_expr_stmt_alloc +%destructor { expr_free($$); } set_elem_expr_stmt set_elem_expr_stmt_alloc %type <expr> flow_key_expr flow_key_expr_alloc %destructor { expr_free($$); } flow_key_expr flow_key_expr_alloc
@@ -1781,7 +1783,17 @@ queue_stmt_flag : BYPASS { $$ = NFT_QUEUE_FLAG_BYPASS; } | FANOUT { $$ = NFT_QUEUE_FLAG_CPU_FANOUT; } ; -set_stmt : SET set_stmt_op set_elem_expr symbol_expr +set_elem_expr_stmt : set_elem_expr_stmt_alloc + | set_elem_expr_stmt_alloc set_elem_options + ; + +set_elem_expr_stmt_alloc: concat_expr + { + $$ = set_elem_expr_alloc(&@1, $1); + } + ; + +set_stmt : SET set_stmt_op set_elem_expr_stmt symbol_expr { $$ = set_stmt_alloc(&@$); $$->set.op = $2;
Signature · 1 line
2.1.4
Pablo Neira Ayuso
maintainerPATCH 2/2 netlink_linearize: skip NFTNL_EXPR_DYNSET_TIMEOUT attribute if timeout is unset
Otherwise kernel bails out with EINVAL in case that the sets got no timeout flag.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/netlink_linearize.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
src/netlink_linearize.c +3 -2
@@ -1027,8 +1027,9 @@ static void netlink_gen_set_stmt(struct netlink_linearize_ctx *ctx, nle =alloc_nft_expr ("dynset" );netlink_put_register (nle,NFTNL_EXPR_DYNSET_SREG_KEY , sreg_key); -nftnl_expr_set_u64 (nle,NFTNL_EXPR_DYNSET_TIMEOUT , - stmt->set.key->timeout); +if (stmt->set.key->timeout >0 ) +nftnl_expr_set_u64 (nle,NFTNL_EXPR_DYNSET_TIMEOUT , + stmt->set.key->timeout);nftnl_expr_set_u32 (nle,NFTNL_EXPR_DYNSET_OP , stmt->set.op);nftnl_expr_set_str (nle,NFTNL_EXPR_DYNSET_SET_NAME , set->handle.set);nftnl_expr_set_u32 (nle,NFTNL_EXPR_DYNSET_SET_ID , set->handle.set_id);
Signature · 1 line
2.1.4