netfilter: nf_tables: discard table flag update with pending basechain deletion
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH v2 1/1 netfilter: nf_tables: discard table flag update with pending basechain deletion
Hook unregistration is deferred to the commit phase, same occurs with hook updates triggered by the table dormant flag. When both commands are combined, this results in deleting a basechain while leaving its hook still registered in the core.
Fixes 179d9ba5559a ("netfilter: nf_tables: fix table flag updates")
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v2: nft_trans_chain() is not set by nf_tables_updtable() with NFT_MSG_DELCHAIN,
use trans->ctx.chain instead otherwise null-ptr dereference is possible.
net/netfilter/nf_tables_api.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
net/netfilter/nf_tables_api.c +5 -4
@@ -1210,10 +1210,11 @@ static bool nft_table_pending_update(const struct nft_ctx *ctx)return true;list_for_each_entry (trans, &nft_net->commit_list, list) { -if ((trans->msg_type ==NFT_MSG_NEWCHAIN || - trans->msg_type ==NFT_MSG_DELCHAIN ) && - trans->ctx.table == ctx->table && -nft_trans_chain_update (trans)) +if (trans->ctx.table == ctx->table && + ((trans->msg_type ==NFT_MSG_NEWCHAIN && +nft_trans_chain_update (trans)) || + (trans->msg_type ==NFT_MSG_DELCHAIN && +nft_is_base_chain (trans->ctx.chain))))return true; }
Signature · 1 line
2.30.2