Commit 2a389de8 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: remove l4proto init and get_net callbacks 



Those were needed we still had modular trackers.
As we don't have those anymore, prefer direct calls and remove all
the (un)register infrastructure associated with this.

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

include/net/netfilter/nf_conntrack_l4proto.h

+9 −6
Original line number Diff line number Diff line
@@ -61,12 +61,6 @@ struct nf_conntrack_l4proto { 
	/* Print out the private part of the conntrack. */

	void (*print_conntrack)(struct seq_file *s, struct nf_conn *);

#endif



	/* Init l4proto pernet data */

	int (*init_net)(struct net *net);



	/* Return the per-net protocol part. */

	struct nf_proto_net *(*get_net_proto)(struct net *net);

};



bool icmp_pkt_to_tuple(const struct sk_buff *skb,
@@ -135,6 +129,15 @@ int nf_conntrack_gre_packet(struct nf_conn *ct, 
			    enum ip_conntrack_info ctinfo,

			    const struct nf_hook_state *state);



void nf_conntrack_generic_init_net(struct net *net);

void nf_conntrack_tcp_init_net(struct net *net);

void nf_conntrack_udp_init_net(struct net *net);

void nf_conntrack_gre_init_net(struct net *net);

void nf_conntrack_dccp_init_net(struct net *net);

void nf_conntrack_sctp_init_net(struct net *net);

void nf_conntrack_icmp_init_net(struct net *net);

void nf_conntrack_icmpv6_init_net(struct net *net);



/* Existing built-in generic protocol */

extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_generic;

include/net/netns/conntrack.h

+0 −11
Original line number Diff line number Diff line
@@ -18,17 +18,11 @@ 
struct ctl_table_header;

struct nf_conntrack_ecache;



struct nf_proto_net {

	unsigned int		users;

};



struct nf_generic_net {

	struct nf_proto_net pn;

	unsigned int timeout;

};



struct nf_tcp_net {

	struct nf_proto_net pn;

	unsigned int timeouts[TCP_CONNTRACK_TIMEOUT_MAX];

	unsigned int tcp_loose;

	unsigned int tcp_be_liberal;
@@ -42,18 +36,15 @@ enum udp_conntrack { 
};



struct nf_udp_net {

	struct nf_proto_net pn;

	unsigned int timeouts[UDP_CT_MAX];

};



struct nf_icmp_net {

	struct nf_proto_net pn;

	unsigned int timeout;

};



#ifdef CONFIG_NF_CT_PROTO_DCCP

struct nf_dccp_net {

	struct nf_proto_net pn;

	int dccp_loose;

	unsigned int dccp_timeout[CT_DCCP_MAX + 1];

};
@@ -61,7 +52,6 @@ struct nf_dccp_net { 


#ifdef CONFIG_NF_CT_PROTO_SCTP

struct nf_sctp_net {

	struct nf_proto_net pn;

	unsigned int timeouts[SCTP_CONNTRACK_MAX];

};

#endif
@@ -74,7 +64,6 @@ enum gre_conntrack { 
};



struct nf_gre_net {

	struct nf_proto_net	nf;

	struct list_head	keymap_list;

	unsigned int		timeouts[GRE_CT_MAX];

};

net/netfilter/nf_conntrack_proto.c

+14 −89
Original line number Diff line number Diff line
@@ -123,15 +123,6 @@ static int kill_l4proto(struct nf_conn *i, void *data) 
	return nf_ct_protonum(i) == l4proto->l4proto;

}



static struct nf_proto_net *nf_ct_l4proto_net(struct net *net,

				const struct nf_conntrack_l4proto *l4proto)

{

	if (l4proto->get_net_proto)

		return l4proto->get_net_proto(net);



	return NULL;

}



/* FIXME: Allow NULL functions and sub in pointers to generic for

   them. --RR */

int nf_ct_l4proto_register_one(const struct nf_conntrack_l4proto *l4proto)
@@ -158,27 +149,6 @@ out_unlock: 
}

EXPORT_SYMBOL_GPL(nf_ct_l4proto_register_one);



static int nf_ct_l4proto_pernet_register_one(struct net *net,

					     const struct nf_conntrack_l4proto *l4proto)

{

	int ret = 0;

	struct nf_proto_net *pn = NULL;



	if (l4proto->init_net) {

		ret = l4proto->init_net(net);

		if (ret < 0)

			goto out;

	}



	pn = nf_ct_l4proto_net(net, l4proto);

	if (pn == NULL)

		goto out;



	pn->users++;

out:

	return ret;

}



static void __nf_ct_l4proto_unregister_one(const struct nf_conntrack_l4proto *l4proto)



{
@@ -204,17 +174,6 @@ void nf_ct_l4proto_unregister_one(const struct nf_conntrack_l4proto *l4proto) 
}

EXPORT_SYMBOL_GPL(nf_ct_l4proto_unregister_one);



static void nf_ct_l4proto_pernet_unregister_one(struct net *net,

				const struct nf_conntrack_l4proto *l4proto)

{

	struct nf_proto_net *pn = nf_ct_l4proto_net(net, l4proto);



	if (pn == NULL)

		return;



	pn->users--;

}



static void

nf_ct_l4proto_unregister(const struct nf_conntrack_l4proto * const l4proto[],

			 unsigned int num_proto)
@@ -252,34 +211,6 @@ nf_ct_l4proto_register(const struct nf_conntrack_l4proto * const l4proto[], 
	return ret;

}



static void nf_ct_l4proto_pernet_unregister(struct net *net,

				const struct nf_conntrack_l4proto *const l4proto[],

				unsigned int num_proto)

{

	while (num_proto-- != 0)

		nf_ct_l4proto_pernet_unregister_one(net, l4proto[num_proto]);

}



static int nf_ct_l4proto_pernet_register(struct net *net,

				  const struct nf_conntrack_l4proto *const l4proto[],

				  unsigned int num_proto)

{

	int ret = -EINVAL;

	unsigned int i;



	for (i = 0; i < num_proto; i++) {

		ret = nf_ct_l4proto_pernet_register_one(net, l4proto[i]);

		if (ret < 0)

			break;

	}

	if (i != num_proto) {

		pr_err("nf_conntrack %d: pernet registration failed\n",

		       l4proto[i]->l4proto);

		nf_ct_l4proto_pernet_unregister(net, l4proto, i);

	}

	return ret;

}



static unsigned int nf_confirm(struct sk_buff *skb,

			       unsigned int protoff,

			       struct nf_conn *ct,
@@ -784,31 +715,25 @@ void nf_conntrack_proto_fini(void) 


int nf_conntrack_proto_pernet_init(struct net *net)

{

	int err;

	struct nf_proto_net *pn = nf_ct_l4proto_net(net,

					&nf_conntrack_l4proto_generic);



	err = nf_conntrack_l4proto_generic.init_net(net);

	if (err < 0)

		return err;



	err = nf_ct_l4proto_pernet_register(net, builtin_l4proto,

					    ARRAY_SIZE(builtin_l4proto));

	if (err < 0)

		return err;



	pn->users++;

	nf_conntrack_generic_init_net(net);

	nf_conntrack_udp_init_net(net);

	nf_conntrack_tcp_init_net(net);

	nf_conntrack_icmp_init_net(net);

	nf_conntrack_icmpv6_init_net(net);

#ifdef CONFIG_NF_CT_PROTO_DCCP

	nf_conntrack_dccp_init_net(net);

#endif

#ifdef CONFIG_NF_CT_PROTO_SCTP

	nf_conntrack_sctp_init_net(net);

#endif

#ifdef CONFIG_NF_CT_PROTO_GRE

	nf_conntrack_gre_init_net(net);

#endif

	return 0;

}



void nf_conntrack_proto_pernet_fini(struct net *net)

{

	struct nf_proto_net *pn = nf_ct_l4proto_net(net,

					&nf_conntrack_l4proto_generic);



	nf_ct_l4proto_pernet_unregister(net, builtin_l4proto,

					ARRAY_SIZE(builtin_l4proto));

	pn->users--;

#ifdef CONFIG_NF_CT_PROTO_GRE

	nf_ct_gre_keymap_flush(net);

#endif

net/netfilter/nf_conntrack_proto_dccp.c

+15 −27
Original line number Diff line number Diff line
@@ -724,12 +724,10 @@ dccp_timeout_nla_policy[CTA_TIMEOUT_DCCP_MAX+1] = { 
};

#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */



static int dccp_init_net(struct net *net)

void nf_conntrack_dccp_init_net(struct net *net)

{

	struct nf_dccp_net *dn = nf_dccp_pernet(net);

	struct nf_proto_net *pn = &dn->pn;



	if (!pn->users) {

	/* default values */

	dn->dccp_loose = 1;

	dn->dccp_timeout[CT_DCCP_REQUEST]	= 2 * DCCP_MSL;
@@ -746,14 +744,6 @@ static int dccp_init_net(struct net *net) 
	dn->dccp_timeout[CT_DCCP_NONE] = dn->dccp_timeout[CT_DCCP_REQUEST];

}



	return 0;

}



static struct nf_proto_net *dccp_get_net_proto(struct net *net)

{

	return &net->ct.nf_ct_proto.dccp.pn;

}



const struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp = {

	.l4proto		= IPPROTO_DCCP,

	.can_early_drop		= dccp_can_early_drop,
@@ -778,6 +768,4 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp = { 
		.nla_policy	= dccp_timeout_nla_policy,

	},

#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */

	.init_net		= dccp_init_net,

	.get_net_proto		= dccp_get_net_proto,

};

net/netfilter/nf_conntrack_proto_generic.c

+1 −10
Original line number Diff line number Diff line
@@ -60,18 +60,11 @@ generic_timeout_nla_policy[CTA_TIMEOUT_GENERIC_MAX+1] = { 
};

#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */



static int generic_init_net(struct net *net)

void nf_conntrack_generic_init_net(struct net *net)

{

	struct nf_generic_net *gn = nf_generic_pernet(net);



	gn->timeout = nf_ct_generic_timeout;



	return 0;

}



static struct nf_proto_net *generic_get_net_proto(struct net *net)

{

	return &net->ct.nf_ct_proto.generic.pn;

}



const struct nf_conntrack_l4proto nf_conntrack_l4proto_generic =
@@ -86,6 +79,4 @@ const struct nf_conntrack_l4proto nf_conntrack_l4proto_generic = 
		.nla_policy	= generic_timeout_nla_policy,

	},

#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */

	.init_net		= generic_init_net,

	.get_net_proto		= generic_get_net_proto,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE