NETFILTER: nfnetlink_log: fix reference counting
[NETFILTER]: nfnetlink_log: fix reference counting 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: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
0065572ae6
commit
d684641802
@@ -218,10 +218,8 @@ _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);
|
||||
if (del_timer(&inst->timer))
|
||||
instance_put(inst);
|
||||
}
|
||||
if (inst->qlen)
|
||||
__nfulnl_send(inst);
|
||||
if (inst->skb) {
|
||||
@@ -695,10 +693,8 @@ nfulnl_log_packet(unsigned int pf,
|
||||
UDEBUG("flushing old skb\n");
|
||||
|
||||
/* timer "holds" one reference (we have another one) */
|
||||
if (timer_pending(&inst->timer)) {
|
||||
del_timer(&inst->timer);
|
||||
if (del_timer(&inst->timer))
|
||||
instance_put(inst);
|
||||
}
|
||||
__nfulnl_send(inst);
|
||||
|
||||
if (!(inst->skb = nfulnl_alloc_skb(nlbufsiz, size))) {
|
||||
|
||||
Reference in New Issue
Block a user