From owner-svn-src-all@FreeBSD.ORG  Tue Sep 11 09:38:33 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 35C021065673;
	Tue, 11 Sep 2012 09:38:33 +0000 (UTC)
	(envelope-from kevlo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2056C8FC16;
	Tue, 11 Sep 2012 09:38:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8B9cWQN018126;
	Tue, 11 Sep 2012 09:38:32 GMT (envelope-from kevlo@svn.freebsd.org)
Received: (from kevlo@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8B9cW4K018123;
	Tue, 11 Sep 2012 09:38:32 GMT (envelope-from kevlo@svn.freebsd.org)
Message-Id: <201209110938.q8B9cW4K018123@svn.freebsd.org>
From: Kevin Lo <kevlo@FreeBSD.org>
Date: Tue, 11 Sep 2012 09:38:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240358 - head/sys/fs/nandfs
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Sep 2012 09:38:33 -0000

Author: kevlo
Date: Tue Sep 11 09:38:32 2012
New Revision: 240358
URL: http://svn.freebsd.org/changeset/base/240358

Log:
  Prevent nump NULL pointer dereference in bmap_getlbns()

Modified:
  head/sys/fs/nandfs/bmap.c

Modified: head/sys/fs/nandfs/bmap.c
==============================================================================
--- head/sys/fs/nandfs/bmap.c	Tue Sep 11 08:49:22 2012	(r240357)
+++ head/sys/fs/nandfs/bmap.c	Tue Sep 11 09:38:32 2012	(r240358)
@@ -548,7 +548,8 @@ bmap_getlbns(struct nandfs_node *node, n
 	DPRINTF(BMAP, ("%s: node %p bn=%jx mnindir=%zd enter\n", __func__,
 	    node, bn, MNINDIR(fsdev)));
 
-	*nump = 0;
+	if (nump)
+		*nump = 0;
 	numlevels = 0;
 	realbn = bn;