Merge tag 'vfio-v5.11-rc1' of git://github.com/awilliam/linux-vfio

[linux-2.6-microblaze.git] / net / netfilter / core.c

diff --git a/net/netfilter/core.c b/net/netfilter/core.c
index 3ac7c8c..63d0321 100644 (file)
--- a/net/netfilter/core.c
+++ b/net/netfilter/core.c
@@ -281,6 +281,16 @@ nf_hook_entry_head(struct net *net, int pf, unsigned int hooknum,
                if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_bridge) <= hooknum))
                        return NULL;
                return net->nf.hooks_bridge + hooknum;
+#endif
+#ifdef CONFIG_NETFILTER_INGRESS
+       case NFPROTO_INET:
+               if (WARN_ON_ONCE(hooknum != NF_INET_INGRESS))
+                       return NULL;
+               if (!dev || dev_net(dev) != net) {
+                       WARN_ON_ONCE(1);
+                       return NULL;
+               }
+               return &dev->nf_hooks_ingress;
 #endif
        case NFPROTO_IPV4:
                if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_ipv4) <= hooknum))
@@ -311,20 +321,80 @@ nf_hook_entry_head(struct net *net, int pf, unsigned int hooknum,
        return NULL;
 }
 
+static int nf_ingress_check(struct net *net, const struct nf_hook_ops *reg,
+                           int hooknum)
+{
+#ifndef CONFIG_NETFILTER_INGRESS
+       if (reg->hooknum == hooknum)
+               return -EOPNOTSUPP;
+#endif
+       if (reg->hooknum != hooknum ||
+           !reg->dev || dev_net(reg->dev) != net)
+               return -EINVAL;
+
+       return 0;
+}
+
+static inline bool nf_ingress_hook(const struct nf_hook_ops *reg, int pf)
+{
+       if ((pf == NFPROTO_NETDEV && reg->hooknum == NF_NETDEV_INGRESS) ||
+           (pf == NFPROTO_INET && reg->hooknum == NF_INET_INGRESS))
+               return true;
+
+       return false;
+}
+
+static void nf_static_key_inc(const struct nf_hook_ops *reg, int pf)
+{
+#ifdef CONFIG_JUMP_LABEL
+       int hooknum;
+
+       if (pf == NFPROTO_INET && reg->hooknum == NF_INET_INGRESS) {
+               pf = NFPROTO_NETDEV;
+               hooknum = NF_NETDEV_INGRESS;
+       } else {
+               hooknum = reg->hooknum;
+       }
+       static_key_slow_inc(&nf_hooks_needed[pf][hooknum]);
+#endif
+}
+
+static void nf_static_key_dec(const struct nf_hook_ops *reg, int pf)
+{
+#ifdef CONFIG_JUMP_LABEL
+       int hooknum;
+
+       if (pf == NFPROTO_INET && reg->hooknum == NF_INET_INGRESS) {
+               pf = NFPROTO_NETDEV;
+               hooknum = NF_NETDEV_INGRESS;
+       } else {
+               hooknum = reg->hooknum;
+       }
+       static_key_slow_dec(&nf_hooks_needed[pf][hooknum]);
+#endif
+}
+
 static int __nf_register_net_hook(struct net *net, int pf,
                                  const struct nf_hook_ops *reg)
 {
        struct nf_hook_entries *p, *new_hooks;
        struct nf_hook_entries __rcu **pp;
+       int err;
 
-       if (pf == NFPROTO_NETDEV) {
-#ifndef CONFIG_NETFILTER_INGRESS
-               if (reg->hooknum == NF_NETDEV_INGRESS)
-                       return -EOPNOTSUPP;
-#endif
-               if (reg->hooknum != NF_NETDEV_INGRESS ||
-                   !reg->dev || dev_net(reg->dev) != net)
-                       return -EINVAL;
+       switch (pf) {
+       case NFPROTO_NETDEV:
+               err = nf_ingress_check(net, reg, NF_NETDEV_INGRESS);
+               if (err < 0)
+                       return err;
+               break;
+       case NFPROTO_INET:
+               if (reg->hooknum != NF_INET_INGRESS)
+                       break;
+
+               err = nf_ingress_check(net, reg, NF_INET_INGRESS);
+               if (err < 0)
+                       return err;
+               break;
        }
 
        pp = nf_hook_entry_head(net, pf, reg->hooknum, reg->dev);
@@ -345,12 +415,11 @@ static int __nf_register_net_hook(struct net *net, int pf,
 
        hooks_validate(new_hooks);
 #ifdef CONFIG_NETFILTER_INGRESS
-       if (pf == NFPROTO_NETDEV && reg->hooknum == NF_NETDEV_INGRESS)
+       if (nf_ingress_hook(reg, pf))
                net_inc_ingress_queue();
 #endif
-#ifdef CONFIG_JUMP_LABEL
-       static_key_slow_inc(&nf_hooks_needed[pf][reg->hooknum]);
-#endif
+       nf_static_key_inc(reg, pf);
+
        BUG_ON(p == new_hooks);
        nf_hook_entries_free(p);
        return 0;
@@ -403,12 +472,10 @@ static void __nf_unregister_net_hook(struct net *net, int pf,
 
        if (nf_remove_net_hook(p, reg)) {
 #ifdef CONFIG_NETFILTER_INGRESS
-               if (pf == NFPROTO_NETDEV && reg->hooknum == NF_NETDEV_INGRESS)
+               if (nf_ingress_hook(reg, pf))
                        net_dec_ingress_queue();
 #endif
-#ifdef CONFIG_JUMP_LABEL
-               static_key_slow_dec(&nf_hooks_needed[pf][reg->hooknum]);
-#endif
+               nf_static_key_dec(reg, pf);
        } else {
                WARN_ONCE(1, "hook not found, pf %d num %d", pf, reg->hooknum);
        }
@@ -425,8 +492,12 @@ static void __nf_unregister_net_hook(struct net *net, int pf,
 void nf_unregister_net_hook(struct net *net, const struct nf_hook_ops *reg)
 {
        if (reg->pf == NFPROTO_INET) {
-               __nf_unregister_net_hook(net, NFPROTO_IPV4, reg);
-               __nf_unregister_net_hook(net, NFPROTO_IPV6, reg);
+               if (reg->hooknum == NF_INET_INGRESS) {
+                       __nf_unregister_net_hook(net, NFPROTO_INET, reg);
+               } else {
+                       __nf_unregister_net_hook(net, NFPROTO_IPV4, reg);
+                       __nf_unregister_net_hook(net, NFPROTO_IPV6, reg);
+               }
        } else {
                __nf_unregister_net_hook(net, reg->pf, reg);
        }
@@ -451,14 +522,20 @@ int nf_register_net_hook(struct net *net, const struct nf_hook_ops *reg)
        int err;
 
        if (reg->pf == NFPROTO_INET) {
-               err = __nf_register_net_hook(net, NFPROTO_IPV4, reg);
-               if (err < 0)
-                       return err;
-
-               err = __nf_register_net_hook(net, NFPROTO_IPV6, reg);
-               if (err < 0) {
-                       __nf_unregister_net_hook(net, NFPROTO_IPV4, reg);
-                       return err;
+               if (reg->hooknum == NF_INET_INGRESS) {
+                       err = __nf_register_net_hook(net, NFPROTO_INET, reg);
+                       if (err < 0)
+                               return err;
+               } else {
+                       err = __nf_register_net_hook(net, NFPROTO_IPV4, reg);
+                       if (err < 0)
+                               return err;
+
+                       err = __nf_register_net_hook(net, NFPROTO_IPV6, reg);
+                       if (err < 0) {
+                               __nf_unregister_net_hook(net, NFPROTO_IPV4, reg);
+                               return err;
+                       }
                }
        } else {
                err = __nf_register_net_hook(net, reg->pf, reg);