lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NETFILTER]: nfnetlink_log: fix reference counting

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

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-03-04 16:00:04 -08:00
committed by David S. Miller
parent 7d90e86d31
commit b4d6202b36
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
net/netfilter/nfnetlink_log.c
View File

@@ -218,6 +218,9 @@ _instance_destroy2(struct nfulnl_instance *inst, int lock)
spin_lock_bh(&inst->lock); spin_lock_bh(&inst->lock);
if (inst->skb) { if (inst->skb) {
/* timer "holds" one reference (we have one more) */
if (del_timer(&inst->timer))
instance_put(inst);
if (inst->qlen) if (inst->qlen)
__nfulnl_send(inst); __nfulnl_send(inst);
if (inst->skb) { if (inst->skb) {
@@ -362,9 +365,6 @@ __nfulnl_send(struct nfulnl_instance *inst)
{ {
int status; int status;
if (timer_pending(&inst->timer))
del_timer(&inst->timer);
if (!inst->skb) if (!inst->skb)
return 0; return 0;
@@ -689,6 +689,9 @@ nfulnl_log_packet(unsigned int pf,
* enough room in the skb left. flush to userspace. */ * enough room in the skb left. flush to userspace. */
UDEBUG("flushing old skb\n"); UDEBUG("flushing old skb\n");
/* timer "holds" one reference (we have another one) */
if (del_timer(&inst->timer))
instance_put(inst);
__nfulnl_send(inst); __nfulnl_send(inst);
if (!(inst->skb = nfulnl_alloc_skb(nlbufsiz, size))) { if (!(inst->skb = nfulnl_alloc_skb(nlbufsiz, size))) {