netfilter: nf_tables: pass hook list to nft_{un,}register_flowtable_net_hooks()
This patch prepares for incremental flowtable hook updates. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
parent
d9246a5375
commit
f9382669cf
|
@ -6279,23 +6279,24 @@ static void nft_unregister_flowtable_hook(struct net *net,
|
|||
}
|
||||
|
||||
static void nft_unregister_flowtable_net_hooks(struct net *net,
|
||||
struct nft_flowtable *flowtable)
|
||||
struct list_head *hook_list)
|
||||
{
|
||||
struct nft_hook *hook;
|
||||
|
||||
list_for_each_entry(hook, &flowtable->hook_list, list)
|
||||
list_for_each_entry(hook, hook_list, list)
|
||||
nf_unregister_net_hook(net, &hook->ops);
|
||||
}
|
||||
|
||||
static int nft_register_flowtable_net_hooks(struct net *net,
|
||||
struct nft_table *table,
|
||||
struct list_head *hook_list,
|
||||
struct nft_flowtable *flowtable)
|
||||
{
|
||||
struct nft_hook *hook, *hook2, *next;
|
||||
struct nft_flowtable *ft;
|
||||
int err, i = 0;
|
||||
|
||||
list_for_each_entry(hook, &flowtable->hook_list, list) {
|
||||
list_for_each_entry(hook, hook_list, list) {
|
||||
list_for_each_entry(ft, &table->flowtables, list) {
|
||||
list_for_each_entry(hook2, &ft->hook_list, list) {
|
||||
if (hook->ops.dev == hook2->ops.dev &&
|
||||
|
@ -6326,7 +6327,7 @@ static int nft_register_flowtable_net_hooks(struct net *net,
|
|||
return 0;
|
||||
|
||||
err_unregister_net_hooks:
|
||||
list_for_each_entry_safe(hook, next, &flowtable->hook_list, list) {
|
||||
list_for_each_entry_safe(hook, next, hook_list, list) {
|
||||
if (i-- <= 0)
|
||||
break;
|
||||
|
||||
|
@ -6428,7 +6429,9 @@ static int nf_tables_newflowtable(struct net *net, struct sock *nlsk,
|
|||
flowtable->data.priority = flowtable_hook.priority;
|
||||
flowtable->hooknum = flowtable_hook.num;
|
||||
|
||||
err = nft_register_flowtable_net_hooks(ctx.net, table, flowtable);
|
||||
err = nft_register_flowtable_net_hooks(ctx.net, table,
|
||||
&flowtable->hook_list,
|
||||
flowtable);
|
||||
if (err < 0) {
|
||||
list_for_each_entry_safe(hook, next, &flowtable->hook_list, list) {
|
||||
list_del_rcu(&hook->list);
|
||||
|
@ -7493,7 +7496,7 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)
|
|||
nft_trans_flowtable(trans),
|
||||
NFT_MSG_DELFLOWTABLE);
|
||||
nft_unregister_flowtable_net_hooks(net,
|
||||
nft_trans_flowtable(trans));
|
||||
&nft_trans_flowtable(trans)->hook_list);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -7652,7 +7655,7 @@ static int __nf_tables_abort(struct net *net, bool autoload)
|
|||
trans->ctx.table->use--;
|
||||
list_del_rcu(&nft_trans_flowtable(trans)->list);
|
||||
nft_unregister_flowtable_net_hooks(net,
|
||||
nft_trans_flowtable(trans));
|
||||
&nft_trans_flowtable(trans)->hook_list);
|
||||
break;
|
||||
case NFT_MSG_DELFLOWTABLE:
|
||||
trans->ctx.table->use++;
|
||||
|
|
Loading…
Reference in a new issue