evaluate: check for device in non-netdev chains
Pablo Neira Ayuso
maintainerPATCH 1/2 evaluate: check for device in non-netdev chains
# nft -f /tmp/x
/tmp/x:3:26-36: Error: This chain type cannot be bound to device
type filter hook input device eth0 priority 0
^^^^^^^^^^^Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/evaluate.c | 3 +++ 1 file changed, 3 insertions(+)
src/evaluate.c +3 -0
@@ -3805,6 +3805,9 @@ static int chain_evaluate(struct eval_ctx *ctx, struct chain *chain)if (!chain->dev_expr)return __stmt_binary_error (ctx, &chain->loc,NULL ,"Missing `device' in this chain definition" ); + }else if (chain->dev_expr) { +return __stmt_binary_error (ctx, &chain->dev_expr->location,NULL , +"This chain type cannot be bound to device" ); } }
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 2/2 parser_bison: simplify error in chain type and hook
Remove extra string after error, location is sufficient.
# nft -f x
/tmp/x:3:8-11: Error: unknown chain type
type nput hook input device eth0 priority 0
^^^^Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/parser_bison.y | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
src/parser_bison.y +3 -3
@@ -1880,7 +1880,7 @@ flowtable_block : /* empty */ { $$ = $<flowtable>-1; } $$->hook.loc = @3; $$->hook.name = chain_hookname_lookup($3); if ($$->hook.name == NULL) { - erec_queue(error(&@3, "unknown chain hook %s", $3), + erec_queue(error(&@3, "unknown chain hook"), state->msgs); xfree($3); YYERROR;
@@ -2049,7 +2049,7 @@ hook_spec : TYPE STRING HOOK STRING dev_spec prio_spec const char *chain_type = chain_type_name_lookup($2); if (chain_type == NULL) { - erec_queue(error(&@2, "unknown chain type %s", $2), + erec_queue(error(&@2, "unknown chain type"), state->msgs); xfree($2); YYERROR;
@@ -2061,7 +2061,7 @@ hook_spec : TYPE STRING HOOK STRING dev_spec prio_spec $<chain>0->hook.loc = @4; $<chain>0->hook.name = chain_hookname_lookup($4); if ($<chain>0->hook.name == NULL) { - erec_queue(error(&@4, "unknown chain hook %s", $4), + erec_queue(error(&@4, "unknown chain hook"), state->msgs); xfree($4); YYERROR;
Signature · 1 line
2.11.0