diff options
| author |   Florian Westphal <fw@strlen.de> | 2015-10-23 12:43:18 +0200 |
|---|---|---|
| committer |   Pablo Neira Ayuso <pablo@netfilter.org> | 2015-11-06 19:33:07 +0100 |
| commit | 61b590b9ee4221173ad6990a1150c5c9db73564e (patch) | |
| tree | de86dd047768765a44e4179cd3bf5d753351489c /include/linux/netfilter_ingress.h | |
| parent | selinux: fix random read in selinux_ip_postroute_compat() (diff) | |
| download | wireguard-linux-61b590b9ee4221173ad6990a1150c5c9db73564e.tar.xz wireguard-linux-61b590b9ee4221173ad6990a1150c5c9db73564e.zip | |
netfilter: ingress: don't use nf_hook_list_active
nf_hook_list_active() always returns true once at least one device has
NF_INGRESS hook enabled.
Thus, don't use this function. Instead, inverse the test and use the static
key to elide list_empty test if no NF_INGRESS hooks are active.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/linux/netfilter_ingress.h')
| -rw-r--r-- | include/linux/netfilter_ingress.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/netfilter_ingress.h b/include/linux/netfilter_ingress.h index 187feabe557c..ba7ce8805fe3 100644 --- a/include/linux/netfilter_ingress.h +++ b/include/linux/netfilter_ingress.h @@ -5,10 +5,13 @@ #include <linux/netdevice.h> #ifdef CONFIG_NETFILTER_INGRESS -static inline int nf_hook_ingress_active(struct sk_buff *skb) +static inline bool nf_hook_ingress_active(const struct sk_buff *skb) { - return nf_hook_list_active(&skb->dev->nf_hooks_ingress, - NFPROTO_NETDEV, NF_NETDEV_INGRESS); +#ifdef HAVE_JUMP_LABEL + if (!static_key_false(&nf_hooks_needed[NFPROTO_NETDEV][NF_NETDEV_INGRESS])) + return false; +#endif + return !list_empty(&skb->dev->nf_hooks_ingress); } static inline int nf_hook_ingress(struct sk_buff *skb) |