From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751049AbXCJGUZ (ORCPT ); Sat, 10 Mar 2007 01:20:25 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752780AbXCJGTp (ORCPT ); Sat, 10 Mar 2007 01:19:45 -0500 Received: from mx2.suse.de ([195.135.220.15]:41270 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752689AbXCJGTm (ORCPT ); Sat, 10 Mar 2007 01:19:42 -0500 Date: Fri, 9 Mar 2007 22:18:03 -0800 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, netfilter-devel@lists.netfilter.org, Patrick McHardy , davem@davemloft.net, Michal Miroslaw Subject: [patch 12/20] nfnetlink_log: fix reference counting Message-ID: <20070310061803.GM31412@kroah.com> References: <20070310061234.465093436@mini.kroah.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="nfnetlink_log-fix-reference-counting.patch" In-Reply-To: <20070310061603.GA31412@kroah.com> User-Agent: Mutt/1.5.13 (2006-08-11) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org -stable review patch. If anyone has any objections, please let us know. ------------------ From: Michal Miroslaw [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 Signed-off-by: Patrick McHardy Signed-off-by: Greg Kroah-Hartman --- net/netfilter/nfnetlink_log.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/net/netfilter/nfnetlink_log.c +++ b/net/netfilter/nfnetlink_log.c @@ -220,7 +220,8 @@ _instance_destroy2(struct nfulnl_instanc /* timer "holds" one reference (we have one more) */ if (timer_pending(&inst->timer)) { del_timer(&inst->timer); - instance_put(inst); + +instance_put(inst); } if (inst->qlen) __nfulnl_send(inst); --