diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-12-09 17:26:37 +0300 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-01-08 20:01:19 +0300 |
| commit | 30259408118f550f5969fda19c0d67020d21eda8 (patch) | |
| tree | 865b66ed6f35d83e9b2aab627c92f7782d687b1b | |
| parent | 62a0fe46e2aaba1812d3cbcae014a41539f9eb09 (diff) | |
| download | linux-30259408118f550f5969fda19c0d67020d21eda8.tar.xz | |
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: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | net/netfilter/core.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/netfilter/core.c b/net/netfilter/core.c index bcbaa78ec374..6c9874c8b10a 100644 --- a/net/netfilter/core.c +++ b/net/netfilter/core.c @@ -371,7 +371,7 @@ EXPORT_SYMBOL(nf_register_net_hook); * Therefore replace the to-be-removed hook with a dummy hook. */ 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; bool found = false; @@ -389,14 +389,14 @@ static void nf_remove_net_hook(struct nf_hook_entries *old, if (found) { #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(); #endif #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 } 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) return; } - nf_remove_net_hook(p, reg); + nf_remove_net_hook(p, reg, reg->pf); p = __nf_hook_entries_try_shrink(pp); mutex_unlock(&nf_hook_mutex); |