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

Commit aace57e0 authored by Michal Miroslaw's avatar Michal Miroslaw Committed by David S. Miller
Browse files

[NETFILTER]: nfnetlink_log: fix instance_create() failure path 



Fix memory leak on instance_create() while module is being unloaded.

Signed-off-by: default avatarMichal Miroslaw <mirq-linux@rere.qmqm.pl>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c6a8f648

net/netfilter/nfnetlink_log.c

+5 −5
Original line number Diff line number Diff line
@@ -152,6 +152,11 @@ instance_create(u_int16_t group_num, int pid) 
	if (!inst)

		goto out_unlock;



	if (!try_module_get(THIS_MODULE)) {

		kfree(inst);

		goto out_unlock;

	}



	INIT_HLIST_NODE(&inst->hlist);

	spin_lock_init(&inst->lock);

	/* needs to be two, since we _put() after creation */
@@ -168,9 +173,6 @@ instance_create(u_int16_t group_num, int pid) 
	inst->copy_mode 	= NFULNL_COPY_PACKET;

	inst->copy_range 	= 0xffff;



	if (!try_module_get(THIS_MODULE))

		goto out_free;



	hlist_add_head(&inst->hlist,

		       &instance_table[instance_hashfn(group_num)]);
@@ -181,8 +183,6 @@ instance_create(u_int16_t group_num, int pid) 


	return inst;



out_free:

	instance_put(inst);

out_unlock:

	write_unlock_bh(&instances_lock);

	return NULL;