TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix reference counting (memory leak) problem in __nfulnl_send() and callers related to packet queueing.

Browse Source 
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
This commit is contained in:
Michał Mirosław
2007-03-24 21:27:27 +01:00
committed by Adrian Bunk
parent 18adb12b78
commit b7dc23da85
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/netfilter/nfnetlink_log.c
+12 -3
View File
@@ -210,6 +210,11 @@ _instance_destroy2(struct nfulnl_instance *inst, int lock)
spin_lock_bh(&inst->lock);
if (inst->skb) {
/* timer "holds" one reference (we have one more) */
if (timer_pending(&inst->timer)) {
del_timer(&inst->timer);
instance_put(inst);
}
if (inst->qlen)
__nfulnl_send(inst);
if (inst->skb) {
@@ -346,9 +351,6 @@ __nfulnl_send(struct nfulnl_instance *inst)
{
int status;
if (timer_pending(&inst->timer))
del_timer(&inst->timer);
if (!inst->skb)
return 0;
@@ -375,6 +377,8 @@ static void nfulnl_timer(unsigned long data)
UDEBUG("timer function called, flushing buffer\n");
spin_lock_bh(&inst->lock);
if (timer_pending(&inst->timer)) /* is it always true or false here? */
del_timer(&inst->timer);
__nfulnl_send(inst);
instance_put(inst);
spin_unlock_bh(&inst->lock);
@@ -655,6 +659,11 @@ nfulnl_log_packet(unsigned int pf,
* enough room in the skb left. flush to userspace. */
UDEBUG("flushing old skb\n");
/* timer "holds" one reference (we have another one) */
if (timer_pending(&inst->timer)) {
del_timer(&inst->timer);
instance_put(inst);
}
__nfulnl_send(inst);
if (!(inst->skb = nfulnl_alloc_skb(nlbufsiz, size))) {