ebtables: Fix for broken chain renaming
Phil Sutter
reviewerPATCH 1/1 ebtables: Fix for broken chain renaming
Loading extensions pollutes 'errno' value, hence before using it to indicate failure it should be sanitized. This was done by the called function before the parsing/netlink split and not migrated by accident. Move it into calling code to clarify the connection.
Fixes a7f1e208cdf9c ("nft: split parsing from netlink commands")
Signed-off-by Phil Sutter <[email protected]>
--- iptables/nft.c | 3 --- iptables/tests/shell/testcases/ebtables/0001-ebtables-basic_0 | 4 ++++ iptables/xtables-eb.c | 1 + 3 files changed, 5 insertions(+), 3 deletions(-)
iptables/nft.c +0 -3
@@ -1896,9 +1896,6 @@ int nft_chain_user_rename(struct nft_handle *h,const char *chain,return 0 ; } -/* Config load changed errno. Ensure genuine info for our callers. */ - errno =0 ; -/* Find the old chain to be renamed */ c =nft_chain_find (h, table, chain);if (c ==NULL ) {
iptables/tests/shell/testcases/ebtables/0001-ebtables-basic_0 +4 -0
@@ -86,4 +86,8 @@ if [ $? -eq 0 ]; then exit 1 fi +$XT_MULTI ebtables -t filter -E FOO BAZ || exit 1 +$XT_MULTI ebtables -t filter -L | grep -q FOO && exit 1 +$XT_MULTI ebtables -t filter -L | grep -q BAZ || exit 1 + $XT_MULTI ebtables -t $t -F || exit 0
iptables/xtables-eb.c +1 -0
@@ -853,6 +853,7 @@ int do_commandeb(struct nft_handle *h, int argc, char *argv[], char **table,else if (strchr (argv[optind],' ' ) !=NULL )xtables_error (PARAMETER_PROBLEM ,"Use of ' ' not allowed in chain names" ); + errno =0 ; ret =nft_cmd_chain_user_rename (h, chain, *table, argv[optind]);if (ret !=0 && errno ==ENOENT )
Signature · 1 line
2.28.0
Florian Westphal
maintainerQuoted 7 lines · Phil Sutter
Loading extensions pollutes 'errno' value, hence before using it to indicate failure it should be sanitized. This was done by the called function before the parsing/netlink split and not migrated by accident. Move it into calling code to clarify the connection.
Fixes a7f1e208cdf9c ("nft: split parsing from netlink commands")Signed-off-by Phil Sutter <[email protected]>
Heh. Thanks for adding a test -- LGTM, feel free to push this.