ebtables: fix over-eager -o checks on custom chains
Florian Westphal
maintainerPATCH 1/1 ebtables: fix over-eager -o checks on custom chains
Arturo reports ebtables-nft reports an error when -o is used in custom chains:
-A MYCHAIN -o someif
makes ebtables-nft exit with an error:
"Use -o only in OUTPUT, FORWARD and POSTROUTING chains."
Problem is that all the "-o" checks expect <= NF_BR_POST_ROUTING to mean "builtin", so -1 mistakenly leads to the checks being active.
Reported-by Arturo Borrero Gonzalez <[email protected]>
Signed-off-by Florian Westphal <[email protected]>
--- iptables/xtables-eb.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
iptables/xtables-eb.c +3 -2
@@ -197,7 +197,8 @@ int ebt_get_current_chain(const char *chain)else if (strcmp (chain,"POSTROUTING" ) ==0 )return NF_BR_POST_ROUTING ; -return -1 ; +/* placeholder for user defined chain */ +return NF_BR_NUMHOOKS ; }/*
@@ -1223,7 +1224,7 @@ print_zero: cs.eb.ethproto =htons (cs.eb.ethproto);if (command =='P' ) { -if (selected_chain <0 ) { +if (selected_chain >=NF_BR_NUMHOOKS ) { ret =ebt_set_user_chain_policy (h, *table, chain, policy); }else {if (strcmp (policy,"RETURN" ) ==0 ) {
Signature · 1 line
2.21.0
Pablo Neira Ayuso
maintainerQuoted 9 lines · Florian Westphal
Arturo reports ebtables-nft reports an error when -o is used in custom chains:
-A MYCHAIN -o someif
makes ebtables-nft exit with an error:
"Use -o only in OUTPUT, FORWARD and POSTROUTING chains."Problem is that all the "-o" checks expect <=
NF_BR_POST_ROUTINGto mean "builtin", so -1 mistakenly leads to the checks being active.
LGTM.