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

Commit 35341a61 authored by Taehee Yoo's avatar Taehee Yoo Committed by Pablo Neira Ayuso
Browse files

netfilter: add __exit mark to helper modules 



There are no __exit mark in the helper modules.
because these exit functions used to be called by init function
but now that is not. so we can add __exit mark.

Signed-off-by: default avatarTaehee Yoo <ap420073@gmail.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 2eb0f624

net/netfilter/nf_conntrack_ftp.c

+1 −2
Original line number Diff line number Diff line
@@ -566,8 +566,7 @@ static const struct nf_conntrack_expect_policy ftp_exp_policy = { 
	.timeout	= 5 * 60,

};



/* don't make this __exit, since it's called from __init ! */

static void nf_conntrack_ftp_fini(void)

static void __exit nf_conntrack_ftp_fini(void)

{

	nf_conntrack_helpers_unregister(ftp, ports_c * 2);

	kfree(ftp_buffer);

net/netfilter/nf_conntrack_irc.c

+1 −5
Original line number Diff line number Diff line
@@ -232,8 +232,6 @@ static int help(struct sk_buff *skb, unsigned int protoff, 
static struct nf_conntrack_helper irc[MAX_PORTS] __read_mostly;

static struct nf_conntrack_expect_policy irc_exp_policy;



static void nf_conntrack_irc_fini(void);



static int __init nf_conntrack_irc_init(void)

{

	int i, ret;
@@ -276,9 +274,7 @@ static int __init nf_conntrack_irc_init(void) 
	return 0;

}



/* This function is intentionally _NOT_ defined as __exit, because

 * it is needed by the init function */

static void nf_conntrack_irc_fini(void)

static void __exit nf_conntrack_irc_fini(void)

{

	nf_conntrack_helpers_unregister(irc, ports_c);

	kfree(irc_buffer);

net/netfilter/nf_conntrack_sane.c

+1 −2
Original line number Diff line number Diff line
@@ -173,8 +173,7 @@ static const struct nf_conntrack_expect_policy sane_exp_policy = { 
	.timeout	= 5 * 60,

};



/* don't make this __exit, since it's called from __init ! */

static void nf_conntrack_sane_fini(void)

static void __exit nf_conntrack_sane_fini(void)

{

	nf_conntrack_helpers_unregister(sane, ports_c * 2);

	kfree(sane_buffer);

net/netfilter/nf_conntrack_sip.c

+1 −1
Original line number Diff line number Diff line
@@ -1609,7 +1609,7 @@ static const struct nf_conntrack_expect_policy sip_exp_policy[SIP_EXPECT_MAX + 1 
	},

};



static void nf_conntrack_sip_fini(void)

static void __exit nf_conntrack_sip_fini(void)

{

	nf_conntrack_helpers_unregister(sip, ports_c * 4);

}

net/netfilter/nf_conntrack_tftp.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static const struct nf_conntrack_expect_policy tftp_exp_policy = { 
	.timeout	= 5 * 60,

};



static void nf_conntrack_tftp_fini(void)

static void __exit nf_conntrack_tftp_fini(void)

{

	nf_conntrack_helpers_unregister(tftp, ports_c * 2);

}