Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cb609d5 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

[NETFILTER]: x_tables: create per-netns /proc/net/*_tables_* 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@sw.ru>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 715cf35a

include/linux/netfilter/x_tables.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -357,8 +357,8 @@ extern struct xt_table *xt_find_table_lock(struct net *net, int af, 
					   const char *name);

					   const char *name);

extern void xt_table_unlock(struct xt_table *t);

extern void xt_table_unlock(struct xt_table *t);





extern int xt_proto_init(int af);

extern int xt_proto_init(struct net *net, int af);

extern void xt_proto_fini(int af);

extern void xt_proto_fini(struct net *net, int af);





extern struct xt_table_info *xt_alloc_table_info(unsigned int size);

extern struct xt_table_info *xt_alloc_table_info(unsigned int size);

extern void xt_free_table_info(struct xt_table_info *info);

extern void xt_free_table_info(struct xt_table_info *info);

net/ipv4/netfilter/arp_tables.c

+18 −3
Original line number Original line Diff line number Diff line
@@ -1822,11 +1822,26 @@ static struct nf_sockopt_ops arpt_sockopts = { 
	.owner		= THIS_MODULE,

	.owner		= THIS_MODULE,

};

};





static int __net_init arp_tables_net_init(struct net *net)

{

	return xt_proto_init(net, NF_ARP);

}



static void __net_exit arp_tables_net_exit(struct net *net)

{

	xt_proto_fini(net, NF_ARP);

}



static struct pernet_operations arp_tables_net_ops = {

	.init = arp_tables_net_init,

	.exit = arp_tables_net_exit,

};



static int __init arp_tables_init(void)

static int __init arp_tables_init(void)

{

{

	int ret;

	int ret;





	ret = xt_proto_init(NF_ARP);

	ret = register_pernet_subsys(&arp_tables_net_ops);

	if (ret < 0)

	if (ret < 0)

		goto err1;

		goto err1;
@@ -1851,7 +1866,7 @@ err4: 
err3:

err3:

	xt_unregister_target(&arpt_standard_target);

	xt_unregister_target(&arpt_standard_target);

err2:

err2:

	xt_proto_fini(NF_ARP);

	unregister_pernet_subsys(&arp_tables_net_ops);

err1:

err1:

	return ret;

	return ret;

}

}
@@ -1861,7 +1876,7 @@ static void __exit arp_tables_fini(void) 
	nf_unregister_sockopt(&arpt_sockopts);

	nf_unregister_sockopt(&arpt_sockopts);

	xt_unregister_target(&arpt_error_target);

	xt_unregister_target(&arpt_error_target);

	xt_unregister_target(&arpt_standard_target);

	xt_unregister_target(&arpt_standard_target);

	xt_proto_fini(NF_ARP);

	unregister_pernet_subsys(&arp_tables_net_ops);

}

}





EXPORT_SYMBOL(arpt_register_table);

EXPORT_SYMBOL(arpt_register_table);

net/ipv4/netfilter/ip_tables.c

+18 −3
Original line number Original line Diff line number Diff line
@@ -2213,11 +2213,26 @@ static struct xt_match icmp_matchstruct __read_mostly = { 
	.family		= AF_INET,

	.family		= AF_INET,

};

};





static int __net_init ip_tables_net_init(struct net *net)

{

	return xt_proto_init(net, AF_INET);

}



static void __net_exit ip_tables_net_exit(struct net *net)

{

	xt_proto_fini(net, AF_INET);

}



static struct pernet_operations ip_tables_net_ops = {

	.init = ip_tables_net_init,

	.exit = ip_tables_net_exit,

};



static int __init ip_tables_init(void)

static int __init ip_tables_init(void)

{

{

	int ret;

	int ret;





	ret = xt_proto_init(AF_INET);

	ret = register_pernet_subsys(&ip_tables_net_ops);

	if (ret < 0)

	if (ret < 0)

		goto err1;

		goto err1;
@@ -2247,7 +2262,7 @@ err4: 
err3:

err3:

	xt_unregister_target(&ipt_standard_target);

	xt_unregister_target(&ipt_standard_target);

err2:

err2:

	xt_proto_fini(AF_INET);

	unregister_pernet_subsys(&ip_tables_net_ops);

err1:

err1:

	return ret;

	return ret;

}

}
@@ -2260,7 +2275,7 @@ static void __exit ip_tables_fini(void) 
	xt_unregister_target(&ipt_error_target);

	xt_unregister_target(&ipt_error_target);

	xt_unregister_target(&ipt_standard_target);

	xt_unregister_target(&ipt_standard_target);





	xt_proto_fini(AF_INET);

	unregister_pernet_subsys(&ip_tables_net_ops);

}

}





EXPORT_SYMBOL(ipt_register_table);

EXPORT_SYMBOL(ipt_register_table);

net/ipv6/netfilter/ip6_tables.c

+19 −3
Original line number Original line Diff line number Diff line
@@ -2238,11 +2238,26 @@ static struct xt_match icmp6_matchstruct __read_mostly = { 
	.family		= AF_INET6,

	.family		= AF_INET6,

};

};





static int __net_init ip6_tables_net_init(struct net *net)

{

	return xt_proto_init(net, AF_INET6);

}



static void __net_exit ip6_tables_net_exit(struct net *net)

{

	xt_proto_fini(net, AF_INET6);

}



static struct pernet_operations ip6_tables_net_ops = {

	.init = ip6_tables_net_init,

	.exit = ip6_tables_net_exit,

};



static int __init ip6_tables_init(void)

static int __init ip6_tables_init(void)

{

{

	int ret;

	int ret;





	ret = xt_proto_init(AF_INET6);

	ret = register_pernet_subsys(&ip6_tables_net_ops);

	if (ret < 0)

	if (ret < 0)

		goto err1;

		goto err1;
@@ -2272,7 +2287,7 @@ err4: 
err3:

err3:

	xt_unregister_target(&ip6t_standard_target);

	xt_unregister_target(&ip6t_standard_target);

err2:

err2:

	xt_proto_fini(AF_INET6);

	unregister_pernet_subsys(&ip6_tables_net_ops);

err1:

err1:

	return ret;

	return ret;

}

}
@@ -2284,7 +2299,8 @@ static void __exit ip6_tables_fini(void) 
	xt_unregister_match(&icmp6_matchstruct);

	xt_unregister_match(&icmp6_matchstruct);

	xt_unregister_target(&ip6t_error_target);

	xt_unregister_target(&ip6t_error_target);

	xt_unregister_target(&ip6t_standard_target);

	xt_unregister_target(&ip6t_standard_target);

	xt_proto_fini(AF_INET6);



	unregister_pernet_subsys(&ip6_tables_net_ops);

}

}





/*

/*

net/netfilter/x_tables.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -922,7 +922,7 @@ static const struct file_operations xt_target_ops = { 




#endif /* CONFIG_PROC_FS */

#endif /* CONFIG_PROC_FS */





int xt_proto_init(int af)

int xt_proto_init(struct net *net, int af)

{

{

#ifdef CONFIG_PROC_FS

#ifdef CONFIG_PROC_FS

	char buf[XT_FUNCTION_MAXNAMELEN];

	char buf[XT_FUNCTION_MAXNAMELEN];
@@ -936,7 +936,7 @@ int xt_proto_init(int af) 
#ifdef CONFIG_PROC_FS

#ifdef CONFIG_PROC_FS

	strlcpy(buf, xt_prefix[af], sizeof(buf));

	strlcpy(buf, xt_prefix[af], sizeof(buf));

	strlcat(buf, FORMAT_TABLES, sizeof(buf));

	strlcat(buf, FORMAT_TABLES, sizeof(buf));

	proc = proc_net_fops_create(&init_net, buf, 0440, &xt_table_ops);

	proc = proc_net_fops_create(net, buf, 0440, &xt_table_ops);

	if (!proc)

	if (!proc)

		goto out;

		goto out;

	proc->data = (void *)(unsigned long)af;

	proc->data = (void *)(unsigned long)af;
@@ -944,14 +944,14 @@ int xt_proto_init(int af) 




	strlcpy(buf, xt_prefix[af], sizeof(buf));

	strlcpy(buf, xt_prefix[af], sizeof(buf));

	strlcat(buf, FORMAT_MATCHES, sizeof(buf));

	strlcat(buf, FORMAT_MATCHES, sizeof(buf));

	proc = proc_net_fops_create(&init_net, buf, 0440, &xt_match_ops);

	proc = proc_net_fops_create(net, buf, 0440, &xt_match_ops);

	if (!proc)

	if (!proc)

		goto out_remove_tables;

		goto out_remove_tables;

	proc->data = (void *)(unsigned long)af;

	proc->data = (void *)(unsigned long)af;





	strlcpy(buf, xt_prefix[af], sizeof(buf));

	strlcpy(buf, xt_prefix[af], sizeof(buf));

	strlcat(buf, FORMAT_TARGETS, sizeof(buf));

	strlcat(buf, FORMAT_TARGETS, sizeof(buf));

	proc = proc_net_fops_create(&init_net, buf, 0440, &xt_target_ops);

	proc = proc_net_fops_create(net, buf, 0440, &xt_target_ops);

	if (!proc)

	if (!proc)

		goto out_remove_matches;

		goto out_remove_matches;

	proc->data = (void *)(unsigned long)af;

	proc->data = (void *)(unsigned long)af;
@@ -963,34 +963,34 @@ int xt_proto_init(int af) 
out_remove_matches:

out_remove_matches:

	strlcpy(buf, xt_prefix[af], sizeof(buf));

	strlcpy(buf, xt_prefix[af], sizeof(buf));

	strlcat(buf, FORMAT_MATCHES, sizeof(buf));

	strlcat(buf, FORMAT_MATCHES, sizeof(buf));

	proc_net_remove(&init_net, buf);

	proc_net_remove(net, buf);





out_remove_tables:

out_remove_tables:

	strlcpy(buf, xt_prefix[af], sizeof(buf));

	strlcpy(buf, xt_prefix[af], sizeof(buf));

	strlcat(buf, FORMAT_TABLES, sizeof(buf));

	strlcat(buf, FORMAT_TABLES, sizeof(buf));

	proc_net_remove(&init_net, buf);

	proc_net_remove(net, buf);

out:

out:

	return -1;

	return -1;

#endif

#endif

}

}

EXPORT_SYMBOL_GPL(xt_proto_init);

EXPORT_SYMBOL_GPL(xt_proto_init);





void xt_proto_fini(int af)

void xt_proto_fini(struct net *net, int af)

{

{

#ifdef CONFIG_PROC_FS

#ifdef CONFIG_PROC_FS

	char buf[XT_FUNCTION_MAXNAMELEN];

	char buf[XT_FUNCTION_MAXNAMELEN];





	strlcpy(buf, xt_prefix[af], sizeof(buf));

	strlcpy(buf, xt_prefix[af], sizeof(buf));

	strlcat(buf, FORMAT_TABLES, sizeof(buf));

	strlcat(buf, FORMAT_TABLES, sizeof(buf));

	proc_net_remove(&init_net, buf);

	proc_net_remove(net, buf);





	strlcpy(buf, xt_prefix[af], sizeof(buf));

	strlcpy(buf, xt_prefix[af], sizeof(buf));

	strlcat(buf, FORMAT_TARGETS, sizeof(buf));

	strlcat(buf, FORMAT_TARGETS, sizeof(buf));

	proc_net_remove(&init_net, buf);

	proc_net_remove(net, buf);





	strlcpy(buf, xt_prefix[af], sizeof(buf));

	strlcpy(buf, xt_prefix[af], sizeof(buf));

	strlcat(buf, FORMAT_MATCHES, sizeof(buf));

	strlcat(buf, FORMAT_MATCHES, sizeof(buf));

	proc_net_remove(&init_net, buf);

	proc_net_remove(net, buf);

#endif /*CONFIG_PROC_FS*/

#endif /*CONFIG_PROC_FS*/

}

}

EXPORT_SYMBOL_GPL(xt_proto_fini);

EXPORT_SYMBOL_GPL(xt_proto_fini);