From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752691AbXCJGTo (ORCPT ); Sat, 10 Mar 2007 01:19:44 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752363AbXCJGTl (ORCPT ); Sat, 10 Mar 2007 01:19:41 -0500 Received: from mail.suse.de ([195.135.220.2]:40987 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750948AbXCJGTF (ORCPT ); Sat, 10 Mar 2007 01:19:05 -0500 Date: Fri, 9 Mar 2007 22:17:26 -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 07/20] nfnetlink_log: fix possible NULL pointer dereference Message-ID: <20070310061726.GH31412@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-possible-null-pointer-dereference.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 possible NULL pointer dereference Eliminate possible NULL pointer dereference in nfulnl_recv_config(). Signed-off-by: Michal Miroslaw Signed-off-by: Patrick McHardy Signed-off-by: Greg Kroah-Hartman --- net/netfilter/nfnetlink_log.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/net/netfilter/nfnetlink_log.c +++ b/net/netfilter/nfnetlink_log.c @@ -867,6 +867,9 @@ nfulnl_recv_config(struct sock *ctnl, st ret = -EINVAL; break; } + + if (!inst) + goto out; } else { if (!inst) { UDEBUG("no config command, and no instance for " @@ -920,6 +923,7 @@ nfulnl_recv_config(struct sock *ctnl, st out_put: instance_put(inst); +out: return ret; } --