UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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

Signed-off-by: Michal Miroslaw <mirq-linux@rere.qmqm.pl>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michal Miroslaw 2007-09-28 14:45:27 -07:00 committed by David S. Miller
parent c6a8f64836
commit aace57e054
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/netfilter/nfnetlink_log.c
View File

@ -152,6 +152,11 @@ instance_create(u_int16_t group_num, int pid)
if (!inst) if (!inst)
goto out_unlock; goto out_unlock;
if (!try_module_get(THIS_MODULE)) {
kfree(inst);
goto out_unlock;
}
INIT_HLIST_NODE(&inst->hlist); INIT_HLIST_NODE(&inst->hlist);
spin_lock_init(&inst->lock); spin_lock_init(&inst->lock);
/* needs to be two, since we _put() after creation */ /* 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_mode = NFULNL_COPY_PACKET;
inst->copy_range = 0xffff; inst->copy_range = 0xffff;
if (!try_module_get(THIS_MODULE))
goto out_free;
hlist_add_head(&inst->hlist, hlist_add_head(&inst->hlist,
&instance_table[instance_hashfn(group_num)]); &instance_table[instance_hashfn(group_num)]);
@ -181,8 +183,6 @@ instance_create(u_int16_t group_num, int pid)
return inst; return inst;
out_free:
instance_put(inst);
out_unlock: out_unlock:
write_unlock_bh(&instances_lock); write_unlock_bh(&instances_lock);
return NULL; return NULL;