]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - net/netfilter/nf_conntrack_core.c
Merge branches 'topic/fix/hda' and 'topic/fix/misc' into for-linus
[karo-tx-linux.git] / net / netfilter / nf_conntrack_core.c
index b55944e5e4e2bcdc715f5f3661ab7d001f077474..622d7c671cb78533082f9bf0b655a3bbffcd2f92 100644 (file)
 #include <net/netfilter/nf_conntrack_core.h>
 #include <net/netfilter/nf_conntrack_extend.h>
 #include <net/netfilter/nf_conntrack_acct.h>
+#include <net/netfilter/nf_nat.h>
 
 #define NF_CONNTRACK_VERSION   "0.5.0"
 
+unsigned int
+(*nfnetlink_parse_nat_setup_hook)(struct nf_conn *ct,
+                                 enum nf_nat_manip_type manip,
+                                 struct nlattr *attr) __read_mostly;
+EXPORT_SYMBOL_GPL(nfnetlink_parse_nat_setup_hook);
+
 DEFINE_SPINLOCK(nf_conntrack_lock);
 EXPORT_SYMBOL_GPL(nf_conntrack_lock);
 
@@ -53,12 +60,8 @@ EXPORT_SYMBOL_GPL(nf_conntrack_max);
 struct nf_conn nf_conntrack_untracked __read_mostly;
 EXPORT_SYMBOL_GPL(nf_conntrack_untracked);
 
-unsigned int nf_ct_log_invalid __read_mostly;
 static struct kmem_cache *nf_conntrack_cachep __read_mostly;
 
-DEFINE_PER_CPU(struct ip_conntrack_stat, nf_conntrack_stat);
-EXPORT_PER_CPU_SYMBOL(nf_conntrack_stat);
-
 static int nf_conntrack_hash_rnd_initted;
 static unsigned int nf_conntrack_hash_rnd;
 
@@ -171,6 +174,7 @@ static void
 destroy_conntrack(struct nf_conntrack *nfct)
 {
        struct nf_conn *ct = (struct nf_conn *)nfct;
+       struct net *net = nf_ct_net(ct);
        struct nf_conntrack_l4proto *l4proto;
 
        pr_debug("destroy_conntrack(%p)\n", ct);
@@ -203,7 +207,7 @@ destroy_conntrack(struct nf_conntrack *nfct)
                hlist_del(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnode);
        }
 
-       NF_CT_STAT_INC(delete);
+       NF_CT_STAT_INC(net, delete);
        spin_unlock_bh(&nf_conntrack_lock);
 
        if (ct->master)
@@ -216,6 +220,7 @@ destroy_conntrack(struct nf_conntrack *nfct)
 static void death_by_timeout(unsigned long ul_conntrack)
 {
        struct nf_conn *ct = (void *)ul_conntrack;
+       struct net *net = nf_ct_net(ct);
        struct nf_conn_help *help = nfct_help(ct);
        struct nf_conntrack_helper *helper;
 
@@ -230,7 +235,7 @@ static void death_by_timeout(unsigned long ul_conntrack)
        spin_lock_bh(&nf_conntrack_lock);
        /* Inside lock so preempt is disabled on module removal path.
         * Otherwise we can get spurious warnings. */
-       NF_CT_STAT_INC(delete_list);
+       NF_CT_STAT_INC(net, delete_list);
        clean_from_lists(ct);
        spin_unlock_bh(&nf_conntrack_lock);
        nf_ct_put(ct);
@@ -249,11 +254,11 @@ __nf_conntrack_find(struct net *net, const struct nf_conntrack_tuple *tuple)
        local_bh_disable();
        hlist_for_each_entry_rcu(h, n, &net->ct.hash[hash], hnode) {
                if (nf_ct_tuple_equal(tuple, &h->tuple)) {
-                       NF_CT_STAT_INC(found);
+                       NF_CT_STAT_INC(net, found);
                        local_bh_enable();
                        return h;
                }
-               NF_CT_STAT_INC(searched);
+               NF_CT_STAT_INC(net, searched);
        }
        local_bh_enable();
 
@@ -366,7 +371,7 @@ __nf_conntrack_confirm(struct sk_buff *skb)
        add_timer(&ct->timeout);
        atomic_inc(&ct->ct_general.use);
        set_bit(IPS_CONFIRMED_BIT, &ct->status);
-       NF_CT_STAT_INC(insert);
+       NF_CT_STAT_INC(net, insert);
        spin_unlock_bh(&nf_conntrack_lock);
        help = nfct_help(ct);
        if (help && help->helper)
@@ -381,7 +386,7 @@ __nf_conntrack_confirm(struct sk_buff *skb)
        return NF_ACCEPT;
 
 out:
-       NF_CT_STAT_INC(insert_failed);
+       NF_CT_STAT_INC(net, insert_failed);
        spin_unlock_bh(&nf_conntrack_lock);
        return NF_DROP;
 }
@@ -405,11 +410,11 @@ nf_conntrack_tuple_taken(const struct nf_conntrack_tuple *tuple,
        hlist_for_each_entry_rcu(h, n, &net->ct.hash[hash], hnode) {
                if (nf_ct_tuplehash_to_ctrack(h) != ignored_conntrack &&
                    nf_ct_tuple_equal(tuple, &h->tuple)) {
-                       NF_CT_STAT_INC(found);
+                       NF_CT_STAT_INC(net, found);
                        rcu_read_unlock_bh();
                        return 1;
                }
-               NF_CT_STAT_INC(searched);
+               NF_CT_STAT_INC(net, searched);
        }
        rcu_read_unlock_bh();
 
@@ -454,7 +459,7 @@ static noinline int early_drop(struct net *net, unsigned int hash)
        if (del_timer(&ct->timeout)) {
                death_by_timeout((unsigned long)ct);
                dropped = 1;
-               NF_CT_STAT_INC_ATOMIC(early_drop);
+               NF_CT_STAT_INC_ATOMIC(net, early_drop);
        }
        nf_ct_put(ct);
        return dropped;
@@ -581,7 +586,7 @@ init_conntrack(struct net *net,
                ct->secmark = exp->master->secmark;
 #endif
                nf_conntrack_get(&ct->master->ct_general);
-               NF_CT_STAT_INC(expect_new);
+               NF_CT_STAT_INC(net, expect_new);
        } else {
                struct nf_conntrack_helper *helper;
 
@@ -591,7 +596,7 @@ init_conntrack(struct net *net,
                        if (help)
                                rcu_assign_pointer(help->helper, helper);
                }
-               NF_CT_STAT_INC(new);
+               NF_CT_STAT_INC(net, new);
        }
 
        /* Overload tuple linked list to put us in unconfirmed list. */
@@ -683,7 +688,7 @@ nf_conntrack_in(struct net *net, u_int8_t pf, unsigned int hooknum,
 
        /* Previously seen (loopback or untracked)?  Ignore. */
        if (skb->nfct) {
-               NF_CT_STAT_INC_ATOMIC(ignore);
+               NF_CT_STAT_INC_ATOMIC(net, ignore);
                return NF_ACCEPT;
        }
 
@@ -693,8 +698,8 @@ nf_conntrack_in(struct net *net, u_int8_t pf, unsigned int hooknum,
                                   &dataoff, &protonum);
        if (ret <= 0) {
                pr_debug("not prepared to track yet or error occured\n");
-               NF_CT_STAT_INC_ATOMIC(error);
-               NF_CT_STAT_INC_ATOMIC(invalid);
+               NF_CT_STAT_INC_ATOMIC(net, error);
+               NF_CT_STAT_INC_ATOMIC(net, invalid);
                return -ret;
        }
 
@@ -706,8 +711,8 @@ nf_conntrack_in(struct net *net, u_int8_t pf, unsigned int hooknum,
        if (l4proto->error != NULL) {
                ret = l4proto->error(net, skb, dataoff, &ctinfo, pf, hooknum);
                if (ret <= 0) {
-                       NF_CT_STAT_INC_ATOMIC(error);
-                       NF_CT_STAT_INC_ATOMIC(invalid);
+                       NF_CT_STAT_INC_ATOMIC(net, error);
+                       NF_CT_STAT_INC_ATOMIC(net, invalid);
                        return -ret;
                }
        }
@@ -716,13 +721,13 @@ nf_conntrack_in(struct net *net, u_int8_t pf, unsigned int hooknum,
                               l3proto, l4proto, &set_reply, &ctinfo);
        if (!ct) {
                /* Not valid part of a connection */
-               NF_CT_STAT_INC_ATOMIC(invalid);
+               NF_CT_STAT_INC_ATOMIC(net, invalid);
                return NF_ACCEPT;
        }
 
        if (IS_ERR(ct)) {
                /* Too stressed to deal. */
-               NF_CT_STAT_INC_ATOMIC(drop);
+               NF_CT_STAT_INC_ATOMIC(net, drop);
                return NF_DROP;
        }
 
@@ -735,7 +740,7 @@ nf_conntrack_in(struct net *net, u_int8_t pf, unsigned int hooknum,
                pr_debug("nf_conntrack_in: Can't track with proto module\n");
                nf_conntrack_put(skb->nfct);
                skb->nfct = NULL;
-               NF_CT_STAT_INC_ATOMIC(invalid);
+               NF_CT_STAT_INC_ATOMIC(net, invalid);
                return -ret;
        }
 
@@ -1012,17 +1017,15 @@ void nf_conntrack_flush(struct net *net)
 }
 EXPORT_SYMBOL_GPL(nf_conntrack_flush);
 
-/* Mishearing the voices in his head, our hero wonders how he's
-   supposed to kill the mall. */
-void nf_conntrack_cleanup(struct net *net)
+static void nf_conntrack_cleanup_init_net(void)
 {
-       rcu_assign_pointer(ip_ct_attach, NULL);
-
-       /* This makes sure all current packets have passed through
-          netfilter framework.  Roll on, two-stage module
-          delete... */
-       synchronize_net();
+       nf_conntrack_helper_fini();
+       nf_conntrack_proto_fini();
+       kmem_cache_destroy(nf_conntrack_cachep);
+}
 
+static void nf_conntrack_cleanup_net(struct net *net)
+{
        nf_ct_event_cache_flush(net);
        nf_conntrack_ecache_fini(net);
  i_see_dead_people:
@@ -1035,16 +1038,31 @@ void nf_conntrack_cleanup(struct net *net)
        while (atomic_read(&nf_conntrack_untracked.ct_general.use) > 1)
                schedule();
 
-       rcu_assign_pointer(nf_ct_destroy, NULL);
-
-       kmem_cache_destroy(nf_conntrack_cachep);
        nf_ct_free_hashtable(net->ct.hash, net->ct.hash_vmalloc,
                             nf_conntrack_htable_size);
-
-       nf_conntrack_acct_fini();
+       nf_conntrack_acct_fini(net);
        nf_conntrack_expect_fini(net);
-       nf_conntrack_helper_fini();
-       nf_conntrack_proto_fini();
+       free_percpu(net->ct.stat);
+}
+
+/* Mishearing the voices in his head, our hero wonders how he's
+   supposed to kill the mall. */
+void nf_conntrack_cleanup(struct net *net)
+{
+       if (net_eq(net, &init_net))
+               rcu_assign_pointer(ip_ct_attach, NULL);
+
+       /* This makes sure all current packets have passed through
+          netfilter framework.  Roll on, two-stage module
+          delete... */
+       synchronize_net();
+
+       nf_conntrack_cleanup_net(net);
+
+       if (net_eq(net, &init_net)) {
+               rcu_assign_pointer(nf_ct_destroy, NULL);
+               nf_conntrack_cleanup_init_net();
+       }
 }
 
 struct hlist_head *nf_ct_alloc_hashtable(unsigned int *sizep, int *vmalloced)
@@ -1129,7 +1147,7 @@ EXPORT_SYMBOL_GPL(nf_conntrack_set_hashsize);
 module_param_call(hashsize, nf_conntrack_set_hashsize, param_get_uint,
                  &nf_conntrack_htable_size, 0600);
 
-int nf_conntrack_init(struct net *net)
+static int nf_conntrack_init_init_net(void)
 {
        int max_factor = 8;
        int ret;
@@ -1151,18 +1169,6 @@ int nf_conntrack_init(struct net *net)
                 * entries. */
                max_factor = 4;
        }
-       atomic_set(&net->ct.count, 0);
-       ret = nf_conntrack_ecache_init(net);
-       if (ret < 0)
-               goto err_ecache;
-       net->ct.hash = nf_ct_alloc_hashtable(&nf_conntrack_htable_size,
-                                                 &net->ct.hash_vmalloc);
-       if (!net->ct.hash) {
-               printk(KERN_ERR "Unable to create nf_conntrack_hash\n");
-               goto err_hash;
-       }
-       INIT_HLIST_HEAD(&net->ct.unconfirmed);
-
        nf_conntrack_max = max_factor * nf_conntrack_htable_size;
 
        printk("nf_conntrack version %s (%u buckets, %d max)\n",
@@ -1174,28 +1180,55 @@ int nf_conntrack_init(struct net *net)
                                                0, 0, NULL);
        if (!nf_conntrack_cachep) {
                printk(KERN_ERR "Unable to create nf_conn slab cache\n");
-               goto err_free_hash;
+               ret = -ENOMEM;
+               goto err_cache;
        }
 
        ret = nf_conntrack_proto_init();
        if (ret < 0)
-               goto err_free_conntrack_slab;
-
-       ret = nf_conntrack_expect_init(net);
-       if (ret < 0)
-               goto out_fini_proto;
+               goto err_proto;
 
        ret = nf_conntrack_helper_init();
        if (ret < 0)
-               goto out_fini_expect;
+               goto err_helper;
 
-       ret = nf_conntrack_acct_init();
-       if (ret < 0)
-               goto out_fini_helper;
+       return 0;
+
+err_helper:
+       nf_conntrack_proto_fini();
+err_proto:
+       kmem_cache_destroy(nf_conntrack_cachep);
+err_cache:
+       return ret;
+}
+
+static int nf_conntrack_init_net(struct net *net)
+{
+       int ret;
 
-       /* For use by REJECT target */
-       rcu_assign_pointer(ip_ct_attach, nf_conntrack_attach);
-       rcu_assign_pointer(nf_ct_destroy, destroy_conntrack);
+       atomic_set(&net->ct.count, 0);
+       INIT_HLIST_HEAD(&net->ct.unconfirmed);
+       net->ct.stat = alloc_percpu(struct ip_conntrack_stat);
+       if (!net->ct.stat) {
+               ret = -ENOMEM;
+               goto err_stat;
+       }
+       ret = nf_conntrack_ecache_init(net);
+       if (ret < 0)
+               goto err_ecache;
+       net->ct.hash = nf_ct_alloc_hashtable(&nf_conntrack_htable_size,
+                                                 &net->ct.hash_vmalloc);
+       if (!net->ct.hash) {
+               ret = -ENOMEM;
+               printk(KERN_ERR "Unable to create nf_conntrack_hash\n");
+               goto err_hash;
+       }
+       ret = nf_conntrack_expect_init(net);
+       if (ret < 0)
+               goto err_expect;
+       ret = nf_conntrack_acct_init(net);
+       if (ret < 0)
+               goto err_acct;
 
        /* Set up fake conntrack:
            - to never be deleted, not in any hashes */
@@ -1206,21 +1239,44 @@ int nf_conntrack_init(struct net *net)
        /*  - and look it like as a confirmed connection */
        set_bit(IPS_CONFIRMED_BIT, &nf_conntrack_untracked.status);
 
-       return ret;
+       return 0;
 
-out_fini_helper:
-       nf_conntrack_helper_fini();
-out_fini_expect:
+err_acct:
        nf_conntrack_expect_fini(net);
-out_fini_proto:
-       nf_conntrack_proto_fini();
-err_free_conntrack_slab:
-       kmem_cache_destroy(nf_conntrack_cachep);
-err_free_hash:
+err_expect:
        nf_ct_free_hashtable(net->ct.hash, net->ct.hash_vmalloc,
                             nf_conntrack_htable_size);
 err_hash:
        nf_conntrack_ecache_fini(net);
 err_ecache:
-       return -ENOMEM;
+       free_percpu(net->ct.stat);
+err_stat:
+       return ret;
+}
+
+int nf_conntrack_init(struct net *net)
+{
+       int ret;
+
+       if (net_eq(net, &init_net)) {
+               ret = nf_conntrack_init_init_net();
+               if (ret < 0)
+                       goto out_init_net;
+       }
+       ret = nf_conntrack_init_net(net);
+       if (ret < 0)
+               goto out_net;
+
+       if (net_eq(net, &init_net)) {
+               /* For use by REJECT target */
+               rcu_assign_pointer(ip_ct_attach, nf_conntrack_attach);
+               rcu_assign_pointer(nf_ct_destroy, destroy_conntrack);
+       }
+       return 0;
+
+out_net:
+       if (net_eq(net, &init_net))
+               nf_conntrack_cleanup_init_net();
+out_init_net:
+       return ret;
 }