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

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>

diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index 47c1a8f702c5db1c4d8d2a617e092f4f214ec63c..c35be233eaa21d419cf7a4ed6e0cb1aa985976c7 100644 (file)
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -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))) {