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

Commit 2b95efe7 authored by Jan Engelhardt's avatar Jan Engelhardt
Browse files

netfilter: xtables: use xt_table for hook instantiation 



The respective xt_table structures already have most of the metadata
needed for hook setup. Add a 'priority' field to struct xt_table so
that xt_hook_link() can be called with a reduced number of arguments.

So should we be having more tables in the future, it comes at no
static cost (only runtime, as before) - space saved:
6807373->6806555.

Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
parent 2b21e051

include/linux/netfilter/x_tables.h

+4 −0
Original line number Diff line number Diff line
@@ -361,6 +361,7 @@ struct xt_table { 
	struct module *me;



	u_int8_t af;		/* address/protocol family */

	int priority;		/* hook order */



	/* A unique name... */

	const char name[XT_TABLE_MAXNAMELEN];
@@ -522,6 +523,9 @@ static inline unsigned long ifname_compare_aligned(const char *_a, 
	return ret;

}



extern struct nf_hook_ops *xt_hook_link(const struct xt_table *, nf_hookfn *);

extern void xt_hook_unlink(const struct xt_table *, struct nf_hook_ops *);



#ifdef CONFIG_COMPAT

#include <net/compat.h>

net/ipv4/netfilter/arptable_filter.c

+7 −26
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ static const struct xt_table packet_filter = { 
	.valid_hooks	= FILTER_VALID_HOOKS,

	.me		= THIS_MODULE,

	.af		= NFPROTO_ARP,

	.priority	= NF_IP_PRI_FILTER,

};



/* The work comes in here from netfilter.c */
@@ -63,29 +64,7 @@ arptable_filter_hook(unsigned int hook, struct sk_buff *skb, 
	return arpt_do_table(skb, hook, in, out, net->ipv4.arptable_filter);

}



static struct nf_hook_ops arpt_ops[] __read_mostly = {

	{

		.hook		= arptable_filter_hook,

		.owner		= THIS_MODULE,

		.pf		= NFPROTO_ARP,

		.hooknum	= NF_ARP_IN,

		.priority	= NF_IP_PRI_FILTER,

	},

	{

		.hook		= arptable_filter_hook,

		.owner		= THIS_MODULE,

		.pf		= NFPROTO_ARP,

		.hooknum	= NF_ARP_OUT,

		.priority	= NF_IP_PRI_FILTER,

	},

	{

		.hook		= arptable_filter_hook,

		.owner		= THIS_MODULE,

		.pf		= NFPROTO_ARP,

		.hooknum	= NF_ARP_FORWARD,

		.priority	= NF_IP_PRI_FILTER,

	},

};

static struct nf_hook_ops *arpfilter_ops __read_mostly;



static int __net_init arptable_filter_net_init(struct net *net)

{
@@ -115,9 +94,11 @@ static int __init arptable_filter_init(void) 
	if (ret < 0)

		return ret;



	ret = nf_register_hooks(arpt_ops, ARRAY_SIZE(arpt_ops));

	if (ret < 0)

	arpfilter_ops = xt_hook_link(&packet_filter, arptable_filter_hook);

	if (IS_ERR(arpfilter_ops)) {

		ret = PTR_ERR(arpfilter_ops);

		goto cleanup_table;

	}

	return ret;



cleanup_table:
@@ -127,7 +108,7 @@ static int __init arptable_filter_init(void) 


static void __exit arptable_filter_fini(void)

{

	nf_unregister_hooks(arpt_ops, ARRAY_SIZE(arpt_ops));

	xt_hook_unlink(&packet_filter, arpfilter_ops);

	unregister_pernet_subsys(&arptable_filter_net_ops);

}

net/ipv4/netfilter/iptable_filter.c

+7 −26
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ static const struct xt_table packet_filter = { 
	.valid_hooks	= FILTER_VALID_HOOKS,

	.me		= THIS_MODULE,

	.af		= NFPROTO_IPV4,

	.priority	= NF_IP_PRI_FILTER,

};



static unsigned int
@@ -77,29 +78,7 @@ iptable_filter_hook(unsigned int hook, struct sk_buff *skb, 
	return ipt_do_table(skb, hook, in, out, net->ipv4.iptable_filter);

}



static struct nf_hook_ops ipt_ops[] __read_mostly = {

	{

		.hook		= iptable_filter_hook,

		.owner		= THIS_MODULE,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_LOCAL_IN,

		.priority	= NF_IP_PRI_FILTER,

	},

	{

		.hook		= iptable_filter_hook,

		.owner		= THIS_MODULE,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_FORWARD,

		.priority	= NF_IP_PRI_FILTER,

	},

	{

		.hook		= iptable_filter_hook,

		.owner		= THIS_MODULE,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_LOCAL_OUT,

		.priority	= NF_IP_PRI_FILTER,

	},

};

static struct nf_hook_ops *filter_ops __read_mostly;



/* Default to forward because I got too much mail already. */

static int forward = NF_ACCEPT;
@@ -142,9 +121,11 @@ static int __init iptable_filter_init(void) 
		return ret;



	/* Register hooks */

	ret = nf_register_hooks(ipt_ops, ARRAY_SIZE(ipt_ops));

	if (ret < 0)

	filter_ops = xt_hook_link(&packet_filter, iptable_filter_hook);

	if (IS_ERR(filter_ops)) {

		ret = PTR_ERR(filter_ops);

		goto cleanup_table;

	}



	return ret;
@@ -155,7 +136,7 @@ static int __init iptable_filter_init(void) 


static void __exit iptable_filter_fini(void)

{

	nf_unregister_hooks(ipt_ops, ARRAY_SIZE(ipt_ops));

	xt_hook_unlink(&packet_filter, filter_ops);

	unregister_pernet_subsys(&iptable_filter_net_ops);

}

net/ipv4/netfilter/iptable_mangle.c

+7 −40
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ static const struct xt_table packet_mangler = { 
	.valid_hooks	= MANGLE_VALID_HOOKS,

	.me		= THIS_MODULE,

	.af		= NFPROTO_IPV4,

	.priority	= NF_IP_PRI_MANGLE,

};



static unsigned int
@@ -129,43 +130,7 @@ iptable_mangle_hook(unsigned int hook, 
			    dev_net(in)->ipv4.iptable_mangle);

}



static struct nf_hook_ops ipt_ops[] __read_mostly = {

	{

		.hook		= iptable_mangle_hook,

		.owner		= THIS_MODULE,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_PRE_ROUTING,

		.priority	= NF_IP_PRI_MANGLE,

	},

	{

		.hook		= iptable_mangle_hook,

		.owner		= THIS_MODULE,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_LOCAL_IN,

		.priority	= NF_IP_PRI_MANGLE,

	},

	{

		.hook		= iptable_mangle_hook,

		.owner		= THIS_MODULE,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_FORWARD,

		.priority	= NF_IP_PRI_MANGLE,

	},

	{

		.hook		= iptable_mangle_hook,

		.owner		= THIS_MODULE,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_LOCAL_OUT,

		.priority	= NF_IP_PRI_MANGLE,

	},

	{

		.hook		= iptable_mangle_hook,

		.owner		= THIS_MODULE,

		.pf		= NFPROTO_IPV4,

		.hooknum	= NF_INET_POST_ROUTING,

		.priority	= NF_IP_PRI_MANGLE,

	},

};

static struct nf_hook_ops *mangle_ops __read_mostly;



static int __net_init iptable_mangle_net_init(struct net *net)

{
@@ -196,9 +161,11 @@ static int __init iptable_mangle_init(void) 
		return ret;



	/* Register hooks */

	ret = nf_register_hooks(ipt_ops, ARRAY_SIZE(ipt_ops));

	if (ret < 0)

	mangle_ops = xt_hook_link(&packet_mangler, iptable_mangle_hook);

	if (IS_ERR(mangle_ops)) {

		ret = PTR_ERR(mangle_ops);

		goto cleanup_table;

	}



	return ret;
@@ -209,7 +176,7 @@ static int __init iptable_mangle_init(void) 


static void __exit iptable_mangle_fini(void)

{

	nf_unregister_hooks(ipt_ops, ARRAY_SIZE(ipt_ops));

	xt_hook_unlink(&packet_mangler, mangle_ops);

	unregister_pernet_subsys(&iptable_mangle_net_ops);

}

net/ipv4/netfilter/iptable_raw.c

+7 −20
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ static const struct xt_table packet_raw = { 
	.valid_hooks =  RAW_VALID_HOOKS,

	.me = THIS_MODULE,

	.af = NFPROTO_IPV4,

	.priority = NF_IP_PRI_RAW,

};



/* The work comes in here from netfilter.c. */
@@ -61,23 +62,7 @@ iptable_raw_hook(unsigned int hook, struct sk_buff *skb, 
	return ipt_do_table(skb, hook, in, out, net->ipv4.iptable_raw);

}



/* 'raw' is the very first table. */

static struct nf_hook_ops ipt_ops[] __read_mostly = {

	{

		.hook = iptable_raw_hook,

		.pf = NFPROTO_IPV4,

		.hooknum = NF_INET_PRE_ROUTING,

		.priority = NF_IP_PRI_RAW,

		.owner = THIS_MODULE,

	},

	{

		.hook = iptable_raw_hook,

		.pf = NFPROTO_IPV4,

		.hooknum = NF_INET_LOCAL_OUT,

		.priority = NF_IP_PRI_RAW,

		.owner = THIS_MODULE,

	},

};

static struct nf_hook_ops *rawtable_ops __read_mostly;



static int __net_init iptable_raw_net_init(struct net *net)

{
@@ -108,9 +93,11 @@ static int __init iptable_raw_init(void) 
		return ret;



	/* Register hooks */

	ret = nf_register_hooks(ipt_ops, ARRAY_SIZE(ipt_ops));

	if (ret < 0)

	rawtable_ops = xt_hook_link(&packet_raw, iptable_raw_hook);

	if (IS_ERR(rawtable_ops)) {

		ret = PTR_ERR(rawtable_ops);

		goto cleanup_table;

	}



	return ret;
@@ -121,7 +108,7 @@ static int __init iptable_raw_init(void) 


static void __exit iptable_raw_fini(void)

{

	nf_unregister_hooks(ipt_ops, ARRAY_SIZE(ipt_ops));

	xt_hook_unlink(&packet_raw, rawtable_ops);

	unregister_pernet_subsys(&iptable_raw_net_ops);

}