netfilter: ip6tables: unregister the tables by name

Same as the previous patch, but for ip6tables.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h
index b88a27c..8c07426 100644 (file)
--- a/include/linux/netfilter_ipv6/ip6_tables.h
+++ b/include/linux/netfilter_ipv6/ip6_tables.h
@@ -27,9 +27,9 @@ extern void *ip6t_alloc_initial_table(const struct xt_table *);
 int ip6t_register_table(struct net *net, const struct xt_table *table,
                        const struct ip6t_replace *repl,
                        const struct nf_hook_ops *ops, struct xt_table **res);
-void ip6t_unregister_table_pre_exit(struct net *net, struct xt_table *table,
+void ip6t_unregister_table_pre_exit(struct net *net, const char *name,
                                    const struct nf_hook_ops *ops);
-void ip6t_unregister_table_exit(struct net *net, struct xt_table *table);
+void ip6t_unregister_table_exit(struct net *net, const char *name);
 extern unsigned int ip6t_do_table(struct sk_buff *skb,
                                  const struct nf_hook_state *state,
                                  struct xt_table *table);

diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index e605c28..11c80da 100644 (file)
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -1769,15 +1769,21 @@ out_free:
        return ret;
 }
 
-void ip6t_unregister_table_pre_exit(struct net *net, struct xt_table *table,
+void ip6t_unregister_table_pre_exit(struct net *net, const char *name,
                                    const struct nf_hook_ops *ops)
 {
-       nf_unregister_net_hooks(net, ops, hweight32(table->valid_hooks));
+       struct xt_table *table = xt_find_table(net, NFPROTO_IPV6, name);
+
+       if (table)
+               nf_unregister_net_hooks(net, ops, hweight32(table->valid_hooks));
 }
 
-void ip6t_unregister_table_exit(struct net *net, struct xt_table *table)
+void ip6t_unregister_table_exit(struct net *net, const char *name)
 {
-       __ip6t_unregister_table(net, table);
+       struct xt_table *table = xt_find_table(net, NFPROTO_IPV6, name);
+
+       if (table)
+               __ip6t_unregister_table(net, table);
 }
 
 /* Returns 1 if the type and code is matched by the range, 0 otherwise */

diff --git a/net/ipv6/netfilter/ip6table_filter.c b/net/ipv6/netfilter/ip6table_filter.c
index 88337b5..0c9f75e 100644 (file)
--- a/net/ipv6/netfilter/ip6table_filter.c
+++ b/net/ipv6/netfilter/ip6table_filter.c
@@ -75,16 +75,13 @@ static int __net_init ip6table_filter_net_init(struct net *net)
 
 static void __net_exit ip6table_filter_net_pre_exit(struct net *net)
 {
-       if (net->ipv6.ip6table_filter)
-               ip6t_unregister_table_pre_exit(net, net->ipv6.ip6table_filter,
-                                              filter_ops);
+       ip6t_unregister_table_pre_exit(net, "filter",
+                                      filter_ops);
 }
 
 static void __net_exit ip6table_filter_net_exit(struct net *net)
 {
-       if (!net->ipv6.ip6table_filter)
-               return;
-       ip6t_unregister_table_exit(net, net->ipv6.ip6table_filter);
+       ip6t_unregister_table_exit(net, "filter");
        net->ipv6.ip6table_filter = NULL;
 }
 

diff --git a/net/ipv6/netfilter/ip6table_mangle.c b/net/ipv6/netfilter/ip6table_mangle.c
index cee7480..9a22666 100644 (file)
--- a/net/ipv6/netfilter/ip6table_mangle.c
+++ b/net/ipv6/netfilter/ip6table_mangle.c
@@ -95,17 +95,12 @@ static int __net_init ip6table_mangle_table_init(struct net *net)
 
 static void __net_exit ip6table_mangle_net_pre_exit(struct net *net)
 {
-       if (net->ipv6.ip6table_mangle)
-               ip6t_unregister_table_pre_exit(net, net->ipv6.ip6table_mangle,
-                                              mangle_ops);
+       ip6t_unregister_table_pre_exit(net, "mangle", mangle_ops);
 }
 
 static void __net_exit ip6table_mangle_net_exit(struct net *net)
 {
-       if (!net->ipv6.ip6table_mangle)
-               return;
-
-       ip6t_unregister_table_exit(net, net->ipv6.ip6table_mangle);
+       ip6t_unregister_table_exit(net, "mangle");
        net->ipv6.ip6table_mangle = NULL;
 }
 

diff --git a/net/ipv6/netfilter/ip6table_nat.c b/net/ipv6/netfilter/ip6table_nat.c
index 4cef1b4..7eb61e6 100644 (file)
--- a/net/ipv6/netfilter/ip6table_nat.c
+++ b/net/ipv6/netfilter/ip6table_nat.c
@@ -107,7 +107,7 @@ static int __net_init ip6table_nat_table_init(struct net *net)
 
        ret = ip6t_nat_register_lookups(net);
        if (ret < 0) {
-               ip6t_unregister_table_exit(net, net->ipv6.ip6table_nat);
+               ip6t_unregister_table_exit(net, "nat");
                net->ipv6.ip6table_nat = NULL;
        }
        kfree(repl);
@@ -122,9 +122,7 @@ static void __net_exit ip6table_nat_net_pre_exit(struct net *net)
 
 static void __net_exit ip6table_nat_net_exit(struct net *net)
 {
-       if (!net->ipv6.ip6table_nat)
-               return;
-       ip6t_unregister_table_exit(net, net->ipv6.ip6table_nat);
+       ip6t_unregister_table_exit(net, "nat");
        net->ipv6.ip6table_nat = NULL;
 }
 

diff --git a/net/ipv6/netfilter/ip6table_raw.c b/net/ipv6/netfilter/ip6table_raw.c
index 8f9e742..c9a4aad 100644 (file)
--- a/net/ipv6/netfilter/ip6table_raw.c
+++ b/net/ipv6/netfilter/ip6table_raw.c
@@ -68,16 +68,13 @@ static int __net_init ip6table_raw_table_init(struct net *net)
 
 static void __net_exit ip6table_raw_net_pre_exit(struct net *net)
 {
-       if (net->ipv6.ip6table_raw)
-               ip6t_unregister_table_pre_exit(net, net->ipv6.ip6table_raw,
-                                              rawtable_ops);
+       ip6t_unregister_table_pre_exit(net, "raw",
+                                      rawtable_ops);
 }
 
 static void __net_exit ip6table_raw_net_exit(struct net *net)
 {
-       if (!net->ipv6.ip6table_raw)
-               return;
-       ip6t_unregister_table_exit(net, net->ipv6.ip6table_raw);
+       ip6t_unregister_table_exit(net, "raw");
        net->ipv6.ip6table_raw = NULL;
 }
 

diff --git a/net/ipv6/netfilter/ip6table_security.c b/net/ipv6/netfilter/ip6table_security.c
index 5e8c48f..73067e0 100644 (file)
--- a/net/ipv6/netfilter/ip6table_security.c
+++ b/net/ipv6/netfilter/ip6table_security.c
@@ -63,16 +63,12 @@ static int __net_init ip6table_security_table_init(struct net *net)
 
 static void __net_exit ip6table_security_net_pre_exit(struct net *net)
 {
-       if (net->ipv6.ip6table_security)
-               ip6t_unregister_table_pre_exit(net, net->ipv6.ip6table_security,
-                                              sectbl_ops);
+       ip6t_unregister_table_pre_exit(net, "security", sectbl_ops);
 }
 
 static void __net_exit ip6table_security_net_exit(struct net *net)
 {
-       if (!net->ipv6.ip6table_security)
-               return;
-       ip6t_unregister_table_exit(net, net->ipv6.ip6table_security);
+       ip6t_unregister_table_exit(net, "security");
        net->ipv6.ip6table_security = NULL;
 }