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

Commit 9f0f3ebe authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: helpers: remove data_len usage for inkernel helpers 



No need to track this for inkernel helpers anymore as
NF_CT_HELPER_BUILD_BUG_ON checks do this now.

All inkernel helpers know what kind of structure they
stored in helper->data.

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

include/net/netfilter/nf_conntrack_helper.h

+6 −5
Original line number Diff line number Diff line
@@ -29,9 +29,6 @@ struct nf_conntrack_helper { 
	struct module *me;		/* pointer to self */

	const struct nf_conntrack_expect_policy *expect_policy;



	/* length of internal data, ie. sizeof(struct nf_ct_*_master) */

	size_t data_len;



	/* Tuple of things we will help (compared against server response) */

	struct nf_conntrack_tuple tuple;
@@ -49,7 +46,11 @@ struct nf_conntrack_helper { 
	unsigned int expect_class_max;



	unsigned int flags;

	unsigned int queue_num;		/* For user-space helpers. */



	/* For user-space helpers: */

	unsigned int queue_num;

	/* length of userspace private data stored in nf_conn_help->data */

	u16 data_len;

};



/* Must be kept in sync with the classes defined by helpers */
@@ -82,7 +83,7 @@ void nf_ct_helper_init(struct nf_conntrack_helper *helper, 
		       u16 l3num, u16 protonum, const char *name,

		       u16 default_port, u16 spec_port, u32 id,

		       const struct nf_conntrack_expect_policy *exp_pol,

		       u32 expect_class_max, u32 data_len,

		       u32 expect_class_max,

		       int (*help)(struct sk_buff *skb, unsigned int protoff,

				   struct nf_conn *ct,

				   enum ip_conntrack_info ctinfo),

net/netfilter/nf_conntrack_ftp.c

+2 −4
Original line number Diff line number Diff line
@@ -591,12 +591,10 @@ static int __init nf_conntrack_ftp_init(void) 
	for (i = 0; i < ports_c; i++) {

		nf_ct_helper_init(&ftp[2 * i], AF_INET, IPPROTO_TCP, "ftp",

				  FTP_PORT, ports[i], ports[i], &ftp_exp_policy,

				  0, sizeof(struct nf_ct_ftp_master), help,

				  nf_ct_ftp_from_nlattr, THIS_MODULE);

				  0, help, nf_ct_ftp_from_nlattr, THIS_MODULE);

		nf_ct_helper_init(&ftp[2 * i + 1], AF_INET6, IPPROTO_TCP, "ftp",

				  FTP_PORT, ports[i], ports[i], &ftp_exp_policy,

				  0, sizeof(struct nf_ct_ftp_master), help,

				  nf_ct_ftp_from_nlattr, THIS_MODULE);

				  0, help, nf_ct_ftp_from_nlattr, THIS_MODULE);

	}



	ret = nf_conntrack_helpers_register(ftp, ports_c * 2);

net/netfilter/nf_conntrack_h323_main.c

+0 −4
Original line number Diff line number Diff line
@@ -637,7 +637,6 @@ static const struct nf_conntrack_expect_policy h245_exp_policy = { 
static struct nf_conntrack_helper nf_conntrack_helper_h245 __read_mostly = {

	.name			= "H.245",

	.me			= THIS_MODULE,

	.data_len		= sizeof(struct nf_ct_h323_master),

	.tuple.src.l3num	= AF_UNSPEC,

	.tuple.dst.protonum	= IPPROTO_UDP,

	.help			= h245_help,
@@ -1215,7 +1214,6 @@ static struct nf_conntrack_helper nf_conntrack_helper_q931[] __read_mostly = { 
	{

		.name			= "Q.931",

		.me			= THIS_MODULE,

		.data_len		= sizeof(struct nf_ct_h323_master),

		.tuple.src.l3num	= AF_INET,

		.tuple.src.u.tcp.port	= cpu_to_be16(Q931_PORT),

		.tuple.dst.protonum	= IPPROTO_TCP,
@@ -1800,7 +1798,6 @@ static struct nf_conntrack_helper nf_conntrack_helper_ras[] __read_mostly = { 
	{

		.name			= "RAS",

		.me			= THIS_MODULE,

		.data_len		= sizeof(struct nf_ct_h323_master),

		.tuple.src.l3num	= AF_INET,

		.tuple.src.u.udp.port	= cpu_to_be16(RAS_PORT),

		.tuple.dst.protonum	= IPPROTO_UDP,
@@ -1810,7 +1807,6 @@ static struct nf_conntrack_helper nf_conntrack_helper_ras[] __read_mostly = { 
	{

		.name			= "RAS",

		.me			= THIS_MODULE,

		.data_len		= sizeof(struct nf_ct_h323_master),

		.tuple.src.l3num	= AF_INET6,

		.tuple.src.u.udp.port	= cpu_to_be16(RAS_PORT),

		.tuple.dst.protonum	= IPPROTO_UDP,

net/netfilter/nf_conntrack_helper.c

+2 −4
Original line number Diff line number Diff line
@@ -178,8 +178,7 @@ nf_ct_helper_ext_add(struct nf_conn *ct, 
{

	struct nf_conn_help *help;



	help = nf_ct_ext_add_length(ct, NF_CT_EXT_HELPER,

				    helper->data_len, gfp);

	help = nf_ct_ext_add(ct, NF_CT_EXT_HELPER, gfp);

	if (help)

		INIT_HLIST_HEAD(&help->expectations);

	else
@@ -484,7 +483,7 @@ void nf_ct_helper_init(struct nf_conntrack_helper *helper, 
		       u16 l3num, u16 protonum, const char *name,

		       u16 default_port, u16 spec_port, u32 id,

		       const struct nf_conntrack_expect_policy *exp_pol,

		       u32 expect_class_max, u32 data_len,

		       u32 expect_class_max,

		       int (*help)(struct sk_buff *skb, unsigned int protoff,

				   struct nf_conn *ct,

				   enum ip_conntrack_info ctinfo),
@@ -497,7 +496,6 @@ void nf_ct_helper_init(struct nf_conntrack_helper *helper, 
	helper->tuple.src.u.all = htons(spec_port);

	helper->expect_policy = exp_pol;

	helper->expect_class_max = expect_class_max;

	helper->data_len = data_len;

	helper->help = help;

	helper->from_nlattr = from_nlattr;

	helper->me = module;

net/netfilter/nf_conntrack_irc.c

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ static int __init nf_conntrack_irc_init(void) 
	for (i = 0; i < ports_c; i++) {

		nf_ct_helper_init(&irc[i], AF_INET, IPPROTO_TCP, "irc",

				  IRC_PORT, ports[i], i, &irc_exp_policy,

				  0, 0, help, NULL, THIS_MODULE);

				  0, help, NULL, THIS_MODULE);

	}



	ret = nf_conntrack_helpers_register(&irc[0], ports_c);