Commit 6c071754 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: ip6tables: unregister the tables by name 



Same as the previous patch, but for ip6tables.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 20a9df33

include/linux/netfilter_ipv6/ip6_tables.h

+2 −2
Original line number Diff line number Diff line
@@ -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);

net/ipv6/netfilter/ip6_tables.c

+10 −4
Original line number Diff line number Diff line
@@ -1769,14 +1769,20 @@ int ip6t_register_table(struct net *net, const struct xt_table *table, 
	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)

{

	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)

{

	struct xt_table *table = xt_find_table(net, NFPROTO_IPV6, name);



	if (table)

		__ip6t_unregister_table(net, table);

}

net/ipv6/netfilter/ip6table_filter.c

+3 −6
Original line number Diff line number Diff line
@@ -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,

	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;

}

net/ipv6/netfilter/ip6table_mangle.c

+2 −7
Original line number Diff line number Diff line
@@ -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;

}

net/ipv6/netfilter/ip6table_nat.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

}