From b338244abc7f018d79a95657fff88eadee7e9f6b Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Wed, 9 Jan 2019 23:26:05 +0100 Subject: src: fix netdev family device name parsing Should use accept/use quotes, else you can't use this with a device name that is shared with a key word, e.g. 'device vm'. Signed-off-by: Florian Westphal Acked-by: Pablo Neira Ayuso --- src/parser_bison.y | 2 +- src/rule.c | 2 +- tests/shell/testcases/chains/dumps/0021prio_0.nft | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/parser_bison.y b/src/parser_bison.y index 39a3ab04..02a373cb 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -1969,7 +1969,7 @@ int_num : NUM { $$ = $1; } | DASH NUM { $$ = -$2; } ; -dev_spec : DEVICE STRING { $$ = $2; } +dev_spec : DEVICE string { $$ = $2; } | /* empty */ { $$ = NULL; } ; diff --git a/src/rule.c b/src/rule.c index e15a20b3..73b78c75 100644 --- a/src/rule.c +++ b/src/rule.c @@ -1070,7 +1070,7 @@ static void chain_print_declaration(const struct chain *chain, nft_print(octx, "\t\ttype %s hook %s", chain->type, hooknum2str(chain->handle.family, chain->hooknum)); if (chain->dev != NULL) - nft_print(octx, " device %s", chain->dev); + nft_print(octx, " device \"%s\"", chain->dev); nft_print(octx, " priority %s; policy %s;\n", prio2str(octx, priobuf, sizeof(priobuf), chain->handle.family, chain->hooknum, diff --git a/tests/shell/testcases/chains/dumps/0021prio_0.nft b/tests/shell/testcases/chains/dumps/0021prio_0.nft index 20125ba0..ca94d441 100644 --- a/tests/shell/testcases/chains/dumps/0021prio_0.nft +++ b/tests/shell/testcases/chains/dumps/0021prio_0.nft @@ -1364,23 +1364,23 @@ table arp x { } table netdev x { chain ingressfilterm11 { - type filter hook ingress device lo priority -11; policy accept; + type filter hook ingress device "lo" priority -11; policy accept; } chain ingressfilterm10 { - type filter hook ingress device lo priority filter - 10; policy accept; + type filter hook ingress device "lo" priority filter - 10; policy accept; } chain ingressfilter { - type filter hook ingress device lo priority filter; policy accept; + type filter hook ingress device "lo" priority filter; policy accept; } chain ingressfilterp10 { - type filter hook ingress device lo priority filter + 10; policy accept; + type filter hook ingress device "lo" priority filter + 10; policy accept; } chain ingressfilterp11 { - type filter hook ingress device lo priority 11; policy accept; + type filter hook ingress device "lo" priority 11; policy accept; } } table bridge x { -- cgit v1.2.3