Commit 91a089d0 authored by Phil Sutter's avatar Phil Sutter Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_tables: Pass nf_hook_ops to nft_unregister_flowtable_hook() 



The function accesses only the hook's ops field, pass it directly. This
prepares for nft_hooks holding a list of nf_hook_ops in future.

While at it, make use of the function in
__nft_unregister_flowtable_net_hooks() as well.

Signed-off-by: default avatarPhil Sutter <phil@nwl.cc>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 21aa0a03

net/netfilter/nf_tables_api.c

+9 −11
Original line number Diff line number Diff line
@@ -8895,12 +8895,12 @@ nft_flowtable_type_get(struct net *net, u8 family) 
}



/* Only called from error and netdev event paths. */

static void nft_unregister_flowtable_hook(struct net *net,

static void nft_unregister_flowtable_ops(struct net *net,

					 struct nft_flowtable *flowtable,

					  struct nft_hook *hook)

					 struct nf_hook_ops *ops)

{

	nf_unregister_net_hook(net, &hook->ops);

	flowtable->data.type->setup(&flowtable->data, hook->ops.dev,

	nf_unregister_net_hook(net, ops);

	flowtable->data.type->setup(&flowtable->data, ops->dev,

				    FLOW_BLOCK_UNBIND);

}
@@ -8912,9 +8912,7 @@ static void __nft_unregister_flowtable_net_hooks(struct net *net, 
	struct nft_hook *hook, *next;



	list_for_each_entry_safe(hook, next, hook_list, list) {

		nf_unregister_net_hook(net, &hook->ops);

		flowtable->data.type->setup(&flowtable->data, hook->ops.dev,

					    FLOW_BLOCK_UNBIND);

		nft_unregister_flowtable_ops(net, flowtable, &hook->ops);

		if (release_netdev) {

			list_del(&hook->list);

			nft_netdev_hook_free_rcu(hook);
@@ -8983,7 +8981,7 @@ static int nft_register_flowtable_net_hooks(struct net *net, 
		if (i-- <= 0)

			break;



		nft_unregister_flowtable_hook(net, flowtable, hook);

		nft_unregister_flowtable_ops(net, flowtable, &hook->ops);

		list_del_rcu(&hook->list);

		nft_netdev_hook_free_rcu(hook);

	}
@@ -9066,7 +9064,7 @@ static int nft_flowtable_update(struct nft_ctx *ctx, const struct nlmsghdr *nlh, 
err_flowtable_update_hook:

	list_for_each_entry_safe(hook, next, &flowtable_hook.list, list) {

		if (unregister)

			nft_unregister_flowtable_hook(ctx->net, flowtable, hook);

			nft_unregister_flowtable_ops(ctx->net, flowtable, &hook->ops);

		list_del_rcu(&hook->list);

		nft_netdev_hook_free_rcu(hook);

	}
@@ -9639,7 +9637,7 @@ static void nft_flowtable_event(unsigned long event, struct net_device *dev, 
			continue;



		/* flow_offload_netdev_event() cleans up entries for us. */

		nft_unregister_flowtable_hook(dev_net(dev), flowtable, hook);

		nft_unregister_flowtable_ops(dev_net(dev), flowtable, ops);

		list_del_rcu(&hook->list);

		kfree_rcu(hook, rcu);

		break;