From: Pablo Neira Ayuso Date: Mon, 20 May 2019 14:03:33 +0000 (+0200) Subject: nft: don't skip table addition from ERESTART X-Git-Tag: v1.8.3~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce0f774d3e781a6b3b7f9f7af0e2d87149d57780;p=thirdparty%2Fiptables.git nft: don't skip table addition from ERESTART I don't find a scenario that trigger this case. Fixes: 58d7de0181f6 ("xtables: handle concurrent ruleset modifications") Signed-off-by: Pablo Neira Ayuso --- diff --git a/iptables/nft.c b/iptables/nft.c index b9268b63..43b9153c 100644 --- a/iptables/nft.c +++ b/iptables/nft.c @@ -2794,15 +2794,6 @@ static void nft_refresh_transaction(struct nft_handle *h) else if (!n->skip && !exists) n->skip = 1; break; - case NFT_COMPAT_TABLE_ADD: - tablename = nftnl_table_get_str(n->table, NFTNL_TABLE_NAME); - if (!tablename) - continue; - - exists = nft_table_find(h, tablename); - if (n->skip && !exists) - n->skip = 0; - break; case NFT_COMPAT_CHAIN_USER_ADD: tablename = nftnl_chain_get_str(n->chain, NFTNL_CHAIN_TABLE); if (!tablename) @@ -2822,6 +2813,7 @@ static void nft_refresh_transaction(struct nft_handle *h) n->skip = 0; } break; + case NFT_COMPAT_TABLE_ADD: case NFT_COMPAT_CHAIN_ADD: case NFT_COMPAT_CHAIN_ZERO: case NFT_COMPAT_CHAIN_USER_DEL: