Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

Conflicts:

	net/netfilter/nf_conntrack_netlink.c

5 files changed, 118 insertions, 41 deletions

diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index 274194b78247..a65e43a17fbb 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -369,7 +369,7 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb)
                         if (err != -EHOSTUNREACH || !in_dev || IN_DEV_FORWARD(in_dev))
                                 goto free_skb;
 
-                        if (!ip_route_output_key(&init_net, &rt, &fl)) {
+                        if (!ip_route_output_key(dev_net(dev), &rt, &fl)) {
                                 /* - Bridged-and-DNAT'ed traffic doesn't
                                  *   require ip_forwarding. */
                                 if (((struct dst_entry *)rt)->dev == dev) {
diff --git a/net/bridge/netfilter/ebtable_broute.c b/net/bridge/netfilter/ebtable_broute.c
index 246626bb0c87..8604dfc1fc3b 100644
--- a/net/bridge/netfilter/ebtable_broute.c
+++ b/net/bridge/netfilter/ebtable_broute.c
@@ -56,29 +56,47 @@ static int ebt_broute(struct sk_buff *skb)
         int ret;
 
         ret = ebt_do_table(NF_BR_BROUTING, skb, skb->dev, NULL,
-           &broute_table);
+                           dev_net(skb->dev)->xt.broute_table);
         if (ret == NF_DROP)
                 return 1; /* route it */
         return 0; /* bridge it */
 }
 
+static int __net_init broute_net_init(struct net *net)
+{
+        net->xt.broute_table = ebt_register_table(net, &broute_table);
+        if (IS_ERR(net->xt.broute_table))
+                return PTR_ERR(net->xt.broute_table);
+        return 0;
+}
+
+static void __net_exit broute_net_exit(struct net *net)
+{
+        ebt_unregister_table(net->xt.broute_table);
+}
+
+static struct pernet_operations broute_net_ops = {
+        .init = broute_net_init,
+        .exit = broute_net_exit,
+};
+
 static int __init ebtable_broute_init(void)
 {
         int ret;
 
-        ret = ebt_register_table(&broute_table);
+        ret = register_pernet_subsys(&broute_net_ops);
         if (ret < 0)
                 return ret;
         /* see br_input.c */
         rcu_assign_pointer(br_should_route_hook, ebt_broute);
-        return ret;
+        return 0;
 }
 
 static void __exit ebtable_broute_fini(void)
 {
         rcu_assign_pointer(br_should_route_hook, NULL);
         synchronize_net();
-        ebt_unregister_table(&broute_table);
+        unregister_pernet_subsys(&broute_net_ops);
 }
 
 module_init(ebtable_broute_init);
diff --git a/net/bridge/netfilter/ebtable_filter.c b/net/bridge/netfilter/ebtable_filter.c
index 1a58af51a2e2..2b2e8040a9c6 100644
--- a/net/bridge/netfilter/ebtable_filter.c
+++ b/net/bridge/netfilter/ebtable_filter.c
@@ -61,29 +61,36 @@ static struct ebt_table frame_filter =
 };
 
 static unsigned int
-ebt_hook(unsigned int hook, struct sk_buff *skb, const struct net_device *in,
+ebt_in_hook(unsigned int hook, struct sk_buff *skb, const struct net_device *in,
    const struct net_device *out, int (*okfn)(struct sk_buff *))
 {
-        return ebt_do_table(hook, skb, in, out, &frame_filter);
+        return ebt_do_table(hook, skb, in, out, dev_net(in)->xt.frame_filter);
+}
+
+static unsigned int
+ebt_out_hook(unsigned int hook, struct sk_buff *skb, const struct net_device *in,
+   const struct net_device *out, int (*okfn)(struct sk_buff *))
+{
+        return ebt_do_table(hook, skb, in, out, dev_net(out)->xt.frame_filter);
 }
 
 static struct nf_hook_ops ebt_ops_filter[] __read_mostly = {
         {
-                .hook           = ebt_hook,
+                .hook           = ebt_in_hook,
                 .owner          = THIS_MODULE,
                 .pf             = PF_BRIDGE,
                 .hooknum        = NF_BR_LOCAL_IN,
                 .priority       = NF_BR_PRI_FILTER_BRIDGED,
         },
         {
-                .hook           = ebt_hook,
+                .hook           = ebt_in_hook,
                 .owner          = THIS_MODULE,
                 .pf             = PF_BRIDGE,
                 .hooknum        = NF_BR_FORWARD,
                 .priority       = NF_BR_PRI_FILTER_BRIDGED,
         },
         {
-                .hook           = ebt_hook,
+                .hook           = ebt_out_hook,
                 .owner          = THIS_MODULE,
                 .pf             = PF_BRIDGE,
                 .hooknum        = NF_BR_LOCAL_OUT,
@@ -91,23 +98,41 @@ static struct nf_hook_ops ebt_ops_filter[] __read_mostly = {
         },
 };
 
+static int __net_init frame_filter_net_init(struct net *net)
+{
+        net->xt.frame_filter = ebt_register_table(net, &frame_filter);
+        if (IS_ERR(net->xt.frame_filter))
+                return PTR_ERR(net->xt.frame_filter);
+        return 0;
+}
+
+static void __net_exit frame_filter_net_exit(struct net *net)
+{
+        ebt_unregister_table(net->xt.frame_filter);
+}
+
+static struct pernet_operations frame_filter_net_ops = {
+        .init = frame_filter_net_init,
+        .exit = frame_filter_net_exit,
+};
+
 static int __init ebtable_filter_init(void)
 {
         int ret;
 
-        ret = ebt_register_table(&frame_filter);
+        ret = register_pernet_subsys(&frame_filter_net_ops);
         if (ret < 0)
                 return ret;
         ret = nf_register_hooks(ebt_ops_filter, ARRAY_SIZE(ebt_ops_filter));
         if (ret < 0)
-                ebt_unregister_table(&frame_filter);
+                unregister_pernet_subsys(&frame_filter_net_ops);
         return ret;
 }
 
 static void __exit ebtable_filter_fini(void)
 {
         nf_unregister_hooks(ebt_ops_filter, ARRAY_SIZE(ebt_ops_filter));
-        ebt_unregister_table(&frame_filter);
+        unregister_pernet_subsys(&frame_filter_net_ops);
 }
 
 module_init(ebtable_filter_init);
diff --git a/net/bridge/netfilter/ebtable_nat.c b/net/bridge/netfilter/ebtable_nat.c
index f60c1e78e575..3fe1ae87e35f 100644
--- a/net/bridge/netfilter/ebtable_nat.c
+++ b/net/bridge/netfilter/ebtable_nat.c
@@ -61,36 +61,36 @@ static struct ebt_table frame_nat =
 };
 
 static unsigned int
-ebt_nat_dst(unsigned int hook, struct sk_buff *skb, const struct net_device *in
+ebt_nat_in(unsigned int hook, struct sk_buff *skb, const struct net_device *in
    , const struct net_device *out, int (*okfn)(struct sk_buff *))
 {
-        return ebt_do_table(hook, skb, in, out, &frame_nat);
+        return ebt_do_table(hook, skb, in, out, dev_net(in)->xt.frame_nat);
 }
 
 static unsigned int
-ebt_nat_src(unsigned int hook, struct sk_buff *skb, const struct net_device *in
+ebt_nat_out(unsigned int hook, struct sk_buff *skb, const struct net_device *in
    , const struct net_device *out, int (*okfn)(struct sk_buff *))
 {
-        return ebt_do_table(hook, skb, in, out, &frame_nat);
+        return ebt_do_table(hook, skb, in, out, dev_net(out)->xt.frame_nat);
 }
 
 static struct nf_hook_ops ebt_ops_nat[] __read_mostly = {
         {
-                .hook           = ebt_nat_dst,
+                .hook           = ebt_nat_out,
                 .owner          = THIS_MODULE,
                 .pf             = PF_BRIDGE,
                 .hooknum        = NF_BR_LOCAL_OUT,
                 .priority       = NF_BR_PRI_NAT_DST_OTHER,
         },
         {
-                .hook           = ebt_nat_src,
+                .hook           = ebt_nat_out,
                 .owner          = THIS_MODULE,
                 .pf             = PF_BRIDGE,
                 .hooknum        = NF_BR_POST_ROUTING,
                 .priority       = NF_BR_PRI_NAT_SRC,
         },
         {
-                .hook           = ebt_nat_dst,
+                .hook           = ebt_nat_in,
                 .owner          = THIS_MODULE,
                 .pf             = PF_BRIDGE,
                 .hooknum        = NF_BR_PRE_ROUTING,
@@ -98,23 +98,41 @@ static struct nf_hook_ops ebt_ops_nat[] __read_mostly = {
         },
 };
 
+static int __net_init frame_nat_net_init(struct net *net)
+{
+        net->xt.frame_nat = ebt_register_table(net, &frame_nat);
+        if (IS_ERR(net->xt.frame_nat))
+                return PTR_ERR(net->xt.frame_nat);
+        return 0;
+}
+
+static void __net_exit frame_nat_net_exit(struct net *net)
+{
+        ebt_unregister_table(net->xt.frame_nat);
+}
+
+static struct pernet_operations frame_nat_net_ops = {
+        .init = frame_nat_net_init,
+        .exit = frame_nat_net_exit,
+};
+
 static int __init ebtable_nat_init(void)
 {
         int ret;
 
-        ret = ebt_register_table(&frame_nat);
+        ret = register_pernet_subsys(&frame_nat_net_ops);
         if (ret < 0)
                 return ret;
         ret = nf_register_hooks(ebt_ops_nat, ARRAY_SIZE(ebt_ops_nat));
         if (ret < 0)
-                ebt_unregister_table(&frame_nat);
+                unregister_pernet_subsys(&frame_nat_net_ops);
         return ret;
 }
 
 static void __exit ebtable_nat_fini(void)
 {
         nf_unregister_hooks(ebt_ops_nat, ARRAY_SIZE(ebt_ops_nat));
-        ebt_unregister_table(&frame_nat);
+        unregister_pernet_subsys(&frame_nat_net_ops);
 }
 
 module_init(ebtable_nat_init);
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 0fa208e86405..fa108c46e851 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -55,7 +55,6 @@
 
 
 static DEFINE_MUTEX(ebt_mutex);
-static LIST_HEAD(ebt_tables);
 
 static struct xt_target ebt_standard_target = {
         .name       = "standard",
@@ -315,9 +314,11 @@ find_inlist_lock(struct list_head *head, const char *name, const char *prefix,
 }
 
 static inline struct ebt_table *
-find_table_lock(const char *name, int *error, struct mutex *mutex)
+find_table_lock(struct net *net, const char *name, int *error,
+                struct mutex *mutex)
 {
-        return find_inlist_lock(&ebt_tables, name, "ebtable_", error, mutex);
+        return find_inlist_lock(&net->xt.tables[NFPROTO_BRIDGE], name,
+                                "ebtable_", error, mutex);
 }
 
 static inline int
@@ -944,7 +945,7 @@ static void get_counters(struct ebt_counter *oldcounters,
 }
 
 /* replace the table */
-static int do_replace(void __user *user, unsigned int len)
+static int do_replace(struct net *net, void __user *user, unsigned int len)
 {
         int ret, i, countersize;
         struct ebt_table_info *newinfo;
@@ -1016,7 +1017,7 @@ static int do_replace(void __user *user, unsigned int len)
         if (ret != 0)
                 goto free_counterstmp;
 
-        t = find_table_lock(tmp.name, &ret, &ebt_mutex);
+        t = find_table_lock(net, tmp.name, &ret, &ebt_mutex);
         if (!t) {
                 ret = -ENOENT;
                 goto free_iterate;
@@ -1097,7 +1098,7 @@ free_newinfo:
         return ret;
 }
 
-int ebt_register_table(struct ebt_table *table)
+struct ebt_table *ebt_register_table(struct net *net, struct ebt_table *table)
 {
         struct ebt_table_info *newinfo;
         struct ebt_table *t;
@@ -1109,14 +1110,21 @@ int ebt_register_table(struct ebt_table *table)
             repl->entries_size == 0 ||
             repl->counters || table->private) {
                 BUGPRINT("Bad table data for ebt_register_table!!!\n");
-                return -EINVAL;
+                return ERR_PTR(-EINVAL);
+        }
+
+        /* Don't add one table to multiple lists. */
+        table = kmemdup(table, sizeof(struct ebt_table), GFP_KERNEL);
+        if (!table) {
+                ret = -ENOMEM;
+                goto out;
         }
 
         countersize = COUNTER_OFFSET(repl->nentries) * nr_cpu_ids;
         newinfo = vmalloc(sizeof(*newinfo) + countersize);
         ret = -ENOMEM;
         if (!newinfo)
-                return -ENOMEM;
+                goto free_table;
 
         p = vmalloc(repl->entries_size);
         if (!p)
@@ -1148,7 +1156,7 @@ int ebt_register_table(struct ebt_table *table)
 
         if (table->check && table->check(newinfo, table->valid_hooks)) {
                 BUGPRINT("The table doesn't like its own initial data, lol\n");
-                return -EINVAL;
+                return ERR_PTR(-EINVAL);
         }
 
         table->private = newinfo;
@@ -1157,7 +1165,7 @@ int ebt_register_table(struct ebt_table *table)
         if (ret != 0)
                 goto free_chainstack;
 
-        list_for_each_entry(t, &ebt_tables, list) {
+        list_for_each_entry(t, &net->xt.tables[NFPROTO_BRIDGE], list) {
                 if (strcmp(t->name, table->name) == 0) {
                         ret = -EEXIST;
                         BUGPRINT("Table name already exists\n");
@@ -1170,9 +1178,9 @@ int ebt_register_table(struct ebt_table *table)
                 ret = -ENOENT;
                 goto free_unlock;
         }
-        list_add(&table->list, &ebt_tables);
+        list_add(&table->list, &net->xt.tables[NFPROTO_BRIDGE]);
         mutex_unlock(&ebt_mutex);
-        return 0;
+        return table;
 free_unlock:
         mutex_unlock(&ebt_mutex);
 free_chainstack:
@@ -1184,7 +1192,10 @@ free_chainstack:
         vfree(newinfo->entries);
 free_newinfo:
         vfree(newinfo);
-        return ret;
+free_table:
+        kfree(table);
+out:
+        return ERR_PTR(ret);
 }
 
 void ebt_unregister_table(struct ebt_table *table)
@@ -1198,6 +1209,10 @@ void ebt_unregister_table(struct ebt_table *table)
         mutex_lock(&ebt_mutex);
         list_del(&table->list);
         mutex_unlock(&ebt_mutex);
+        EBT_ENTRY_ITERATE(table->private->entries, table->private->entries_size,
+                          ebt_cleanup_entry, NULL);
+        if (table->private->nentries)
+                module_put(table->me);
         vfree(table->private->entries);
         if (table->private->chainstack) {
                 for_each_possible_cpu(i)
@@ -1205,10 +1220,11 @@ void ebt_unregister_table(struct ebt_table *table)
                 vfree(table->private->chainstack);
         }
         vfree(table->private);
+        kfree(table);
 }
 
 /* userspace just supplied us with counters */
-static int update_counters(void __user *user, unsigned int len)
+static int update_counters(struct net *net, void __user *user, unsigned int len)
 {
         int i, ret;
         struct ebt_counter *tmp;
@@ -1228,7 +1244,7 @@ static int update_counters(void __user *user, unsigned int len)
                 return -ENOMEM;
         }
 
-        t = find_table_lock(hlp.name, &ret, &ebt_mutex);
+        t = find_table_lock(net, hlp.name, &ret, &ebt_mutex);
         if (!t)
                 goto free_tmp;
 
@@ -1386,10 +1402,10 @@ static int do_ebt_set_ctl(struct sock *sk,
 
         switch(cmd) {
         case EBT_SO_SET_ENTRIES:
-                ret = do_replace(user, len);
+                ret = do_replace(sock_net(sk), user, len);
                 break;
         case EBT_SO_SET_COUNTERS:
-                ret = update_counters(user, len);
+                ret = update_counters(sock_net(sk), user, len);
                 break;
         default:
                 ret = -EINVAL;
@@ -1406,7 +1422,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
         if (copy_from_user(&tmp, user, sizeof(tmp)))
                 return -EFAULT;
 
-        t = find_table_lock(tmp.name, &ret, &ebt_mutex);
+        t = find_table_lock(sock_net(sk), tmp.name, &ret, &ebt_mutex);
         if (!t)
                 return ret;