Commit 216e7bf7 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: nf_tables: skip netdev hook unregistration if table is dormant 



Skip hook unregistration when adding or deleting devices from an
existing netdev basechain. Otherwise, commit/abort path try to
unregister hooks which not enabled.

Fixes: b9703ed4 ("netfilter: nf_tables: support for adding new devices to an existing netdev chain")
Fixes: 7d937b10 ("netfilter: nf_tables: support for deleting devices in an existing netdev chain")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 1e1fb6f0

net/netfilter/nf_tables_api.c

+10 −6
Original line number Diff line number Diff line
@@ -10212,9 +10212,11 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb) 
			if (nft_trans_chain_update(trans)) {

				nf_tables_chain_notify(&trans->ctx, NFT_MSG_DELCHAIN,

						       &nft_trans_chain_hooks(trans));

				if (!(trans->ctx.table->flags & NFT_TABLE_F_DORMANT)) {

					nft_netdev_unregister_hooks(net,

								    &nft_trans_chain_hooks(trans),

								    true);

				}

			} else {

				nft_chain_del(trans->ctx.chain);

				nf_tables_chain_notify(&trans->ctx, NFT_MSG_DELCHAIN,
@@ -10490,9 +10492,11 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action) 
			break;

		case NFT_MSG_NEWCHAIN:

			if (nft_trans_chain_update(trans)) {

				if (!(trans->ctx.table->flags & NFT_TABLE_F_DORMANT)) {

					nft_netdev_unregister_hooks(net,

								    &nft_trans_chain_hooks(trans),

								    true);

				}

				free_percpu(nft_trans_chain_stats(trans));

				kfree(nft_trans_chain_name(trans));

				nft_trans_destroy(trans);