Commit 30259408 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso

netfilter: core: pass family as parameter to nf_remove_net_hook()

So static_key_slow_dec applies to the family behind NFPROTO_INET.
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 62a0fe46
...@@ -371,7 +371,7 @@ EXPORT_SYMBOL(nf_register_net_hook); ...@@ -371,7 +371,7 @@ EXPORT_SYMBOL(nf_register_net_hook);
* Therefore replace the to-be-removed hook with a dummy hook. * Therefore replace the to-be-removed hook with a dummy hook.
*/ */
static void nf_remove_net_hook(struct nf_hook_entries *old, static void nf_remove_net_hook(struct nf_hook_entries *old,
const struct nf_hook_ops *unreg) const struct nf_hook_ops *unreg, int pf)
{ {
struct nf_hook_ops **orig_ops; struct nf_hook_ops **orig_ops;
bool found = false; bool found = false;
...@@ -389,14 +389,14 @@ static void nf_remove_net_hook(struct nf_hook_entries *old, ...@@ -389,14 +389,14 @@ static void nf_remove_net_hook(struct nf_hook_entries *old,
if (found) { if (found) {
#ifdef CONFIG_NETFILTER_INGRESS #ifdef CONFIG_NETFILTER_INGRESS
if (unreg->pf == NFPROTO_NETDEV && unreg->hooknum == NF_NETDEV_INGRESS) if (pf == NFPROTO_NETDEV && unreg->hooknum == NF_NETDEV_INGRESS)
net_dec_ingress_queue(); net_dec_ingress_queue();
#endif #endif
#ifdef HAVE_JUMP_LABEL #ifdef HAVE_JUMP_LABEL
static_key_slow_dec(&nf_hooks_needed[unreg->pf][unreg->hooknum]); static_key_slow_dec(&nf_hooks_needed[pf][unreg->hooknum]);
#endif #endif
} else { } else {
WARN_ONCE(1, "hook not found, pf %d num %d", unreg->pf, unreg->hooknum); WARN_ONCE(1, "hook not found, pf %d num %d", pf, unreg->hooknum);
} }
} }
...@@ -417,7 +417,7 @@ void nf_unregister_net_hook(struct net *net, const struct nf_hook_ops *reg) ...@@ -417,7 +417,7 @@ void nf_unregister_net_hook(struct net *net, const struct nf_hook_ops *reg)
return; return;
} }
nf_remove_net_hook(p, reg); nf_remove_net_hook(p, reg, reg->pf);
p = __nf_hook_entries_try_shrink(pp); p = __nf_hook_entries_try_shrink(pp);
mutex_unlock(&nf_hook_mutex); mutex_unlock(&nf_hook_mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment