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

Commit 4c8bc54b authored by Gao Feng's avatar Gao Feng Committed by Greg Kroah-Hartman
Browse files

netfilter: nf_nat_snmp: Fix panic when snmp_trap_helper fails to register 




[ Upstream commit 75c689dca98851d65ef5a27e5ce26b625b68751c ]

In the commit 93557f53 ("netfilter: nf_conntrack: nf_conntrack snmp
helper"), the snmp_helper is replaced by nf_nat_snmp_hook. So the
snmp_helper is never registered. But it still tries to unregister the
snmp_helper, it could cause the panic.

Now remove the useless snmp_helper and the unregister call in the
error handler.

Fixes: 93557f53 ("netfilter: nf_conntrack: nf_conntrack snmp helper")
Signed-off-by: default avatarGao Feng <fgao@ikuai8.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6237e86d

net/ipv4/netfilter/nf_nat_snmp_basic.c

+1 −18
Original line number Original line Diff line number Diff line
@@ -1260,16 +1260,6 @@ static const struct nf_conntrack_expect_policy snmp_exp_policy = { 
	.timeout	= 180,

	.timeout	= 180,

};

};





static struct nf_conntrack_helper snmp_helper __read_mostly = {

	.me			= THIS_MODULE,

	.help			= help,

	.expect_policy		= &snmp_exp_policy,

	.name			= "snmp",

	.tuple.src.l3num	= AF_INET,

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

	.tuple.dst.protonum	= IPPROTO_UDP,

};



static struct nf_conntrack_helper snmp_trap_helper __read_mostly = {

static struct nf_conntrack_helper snmp_trap_helper __read_mostly = {

	.me			= THIS_MODULE,

	.me			= THIS_MODULE,

	.help			= help,

	.help			= help,
@@ -1288,17 +1278,10 @@ static struct nf_conntrack_helper snmp_trap_helper __read_mostly = { 




static int __init nf_nat_snmp_basic_init(void)

static int __init nf_nat_snmp_basic_init(void)

{

{

	int ret = 0;



	BUG_ON(nf_nat_snmp_hook != NULL);

	BUG_ON(nf_nat_snmp_hook != NULL);

	RCU_INIT_POINTER(nf_nat_snmp_hook, help);

	RCU_INIT_POINTER(nf_nat_snmp_hook, help);





	ret = nf_conntrack_helper_register(&snmp_trap_helper);

	return nf_conntrack_helper_register(&snmp_trap_helper);

	if (ret < 0) {

		nf_conntrack_helper_unregister(&snmp_helper);

		return ret;

	}

	return ret;

}

}





static void __exit nf_nat_snmp_basic_fini(void)

static void __exit nf_nat_snmp_basic_fini(void)