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

Commit 9858a3ae authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Patrick McHardy
Browse files

netfilter: conntrack: move helper destruction to nf_ct_helper_destroy() 



This patch moves the helper destruction to a function that lives
in nf_conntrack_helper.c. This new function is used in the patch
to add ctnetlink reliable event delivery.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent a0891aa6

include/net/netfilter/nf_conntrack_helper.h

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ extern struct nf_conn_help *nf_ct_helper_ext_add(struct nf_conn *ct, gfp_t gfp); 


extern int __nf_ct_try_assign_helper(struct nf_conn *ct, gfp_t flags);



extern void nf_ct_helper_destroy(struct nf_conn *ct);



static inline struct nf_conn_help *nfct_help(const struct nf_conn *ct)

{

	return nf_ct_ext_find(ct, NF_CT_EXT_HELPER);

net/netfilter/nf_conntrack_core.c

+1 −10
Original line number Diff line number Diff line
@@ -224,17 +224,8 @@ static void death_by_timeout(unsigned long ul_conntrack) 
{

	struct nf_conn *ct = (void *)ul_conntrack;

	struct net *net = nf_ct_net(ct);

	struct nf_conn_help *help = nfct_help(ct);

	struct nf_conntrack_helper *helper;



	if (help) {

		rcu_read_lock();

		helper = rcu_dereference(help->helper);

		if (helper && helper->destroy)

			helper->destroy(ct);

		rcu_read_unlock();

	}



	nf_ct_helper_destroy(ct);

	spin_lock_bh(&nf_conntrack_lock);

	/* Inside lock so preempt is disabled on module removal path.

	 * Otherwise we can get spurious warnings. */

net/netfilter/nf_conntrack_helper.c

+14 −0
Original line number Diff line number Diff line
@@ -136,6 +136,20 @@ static inline int unhelp(struct nf_conntrack_tuple_hash *i, 
	return 0;

}



void nf_ct_helper_destroy(struct nf_conn *ct)

{

	struct nf_conn_help *help = nfct_help(ct);

	struct nf_conntrack_helper *helper;



	if (help) {

		rcu_read_lock();

		helper = rcu_dereference(help->helper);

		if (helper && helper->destroy)

			helper->destroy(ct);

		rcu_read_unlock();

	}

}



int nf_conntrack_helper_register(struct nf_conntrack_helper *me)

{

	unsigned int h = helper_hash(&me->tuple);