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

netfilter: conntrack: un-inline nf_ct_ecache_ext_add 



Only called when new ct is allocated or the extension isn't present.
This function will be extended, place this in the conntrack module
instead of inlining.

The callers already depend on nf_conntrack module.
Return value is changed to bool, noone used the returned pointer.

Make sure that the core drops the newly allocated conntrack
if the extension is requested but can't be added.
This makes it necessary to ifdef the section, as the stub
always returns false we'd drop every new conntrack if the
the ecache extension is disabled in kconfig.

Add from data path (xt_CT, nft_ct) is unchanged.

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

include/net/netfilter/nf_conntrack_ecache.h

+5 −25
Original line number Diff line number Diff line
@@ -36,31 +36,6 @@ nf_ct_ecache_find(const struct nf_conn *ct) 
#endif

}



static inline struct nf_conntrack_ecache *

nf_ct_ecache_ext_add(struct nf_conn *ct, u16 ctmask, u16 expmask, gfp_t gfp)

{

#ifdef CONFIG_NF_CONNTRACK_EVENTS

	struct net *net = nf_ct_net(ct);

	struct nf_conntrack_ecache *e;



	if (!ctmask && !expmask && net->ct.sysctl_events) {

		ctmask = ~0;

		expmask = ~0;

	}

	if (!ctmask && !expmask)

		return NULL;



	e = nf_ct_ext_add(ct, NF_CT_EXT_ECACHE, gfp);

	if (e) {

		e->ctmask  = ctmask;

		e->expmask = expmask;

	}

	return e;

#else

	return NULL;

#endif

}



#ifdef CONFIG_NF_CONNTRACK_EVENTS



/* This structure is passed to event handler */
@@ -89,6 +64,7 @@ void nf_ct_deliver_cached_events(struct nf_conn *ct); 
int nf_conntrack_eventmask_report(unsigned int eventmask, struct nf_conn *ct,

				  u32 portid, int report);



bool nf_ct_ecache_ext_add(struct nf_conn *ct, u16 ctmask, u16 expmask, gfp_t gfp);

#else



static inline void nf_ct_deliver_cached_events(const struct nf_conn *ct)
@@ -103,6 +79,10 @@ static inline int nf_conntrack_eventmask_report(unsigned int eventmask, 
	return 0;

}



static inline bool nf_ct_ecache_ext_add(struct nf_conn *ct, u16 ctmask, u16 expmask, gfp_t gfp)

{

	return false;

}

#endif



static inline void

net/netfilter/nf_conntrack_core.c

+11 −3
Original line number Diff line number Diff line
@@ -1698,7 +1698,9 @@ init_conntrack(struct net *net, struct nf_conn *tmpl, 
	struct nf_conn *ct;

	struct nf_conn_help *help;

	struct nf_conntrack_tuple repl_tuple;

#ifdef CONFIG_NF_CONNTRACK_EVENTS

	struct nf_conntrack_ecache *ecache;

#endif

	struct nf_conntrack_expect *exp = NULL;

	const struct nf_conntrack_zone *zone;

	struct nf_conn_timeout *timeout_ext;
@@ -1731,10 +1733,16 @@ init_conntrack(struct net *net, struct nf_conn *tmpl, 
	nf_ct_tstamp_ext_add(ct, GFP_ATOMIC);

	nf_ct_labels_ext_add(ct);



#ifdef CONFIG_NF_CONNTRACK_EVENTS

	ecache = tmpl ? nf_ct_ecache_find(tmpl) : NULL;

	nf_ct_ecache_ext_add(ct, ecache ? ecache->ctmask : 0,



	if (!nf_ct_ecache_ext_add(ct, ecache ? ecache->ctmask : 0,

				  ecache ? ecache->expmask : 0,

			     GFP_ATOMIC);

				  GFP_ATOMIC)) {

		nf_conntrack_free(ct);

		return ERR_PTR(-ENOMEM);

	}

#endif



	cnet = nf_ct_pernet(net);

	if (cnet->expect_count) {

net/netfilter/nf_conntrack_ecache.c

+22 −0
Original line number Diff line number Diff line
@@ -297,6 +297,28 @@ void nf_conntrack_ecache_work(struct net *net, enum nf_ct_ecache_state state) 
	}

}



bool nf_ct_ecache_ext_add(struct nf_conn *ct, u16 ctmask, u16 expmask, gfp_t gfp)

{

	struct net *net = nf_ct_net(ct);

	struct nf_conntrack_ecache *e;



	if (!ctmask && !expmask && net->ct.sysctl_events) {

		ctmask = ~0;

		expmask = ~0;

	}

	if (!ctmask && !expmask)

		return false;



	e = nf_ct_ext_add(ct, NF_CT_EXT_ECACHE, gfp);

	if (e) {

		e->ctmask  = ctmask;

		e->expmask = expmask;

	}



	return e != NULL;

}

EXPORT_SYMBOL_GPL(nf_ct_ecache_ext_add);



#define NF_CT_EVENTS_DEFAULT 1

static int nf_ct_events __read_mostly = NF_CT_EVENTS_DEFAULT;