From owner-svn-src-all@FreeBSD.ORG  Wed Jan 28 23:22:43 2015
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:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 54B941EF;
 Wed, 28 Jan 2015 23:22:43 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4047F27B;
 Wed, 28 Jan 2015 23:22:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0SNMhpj025446;
 Wed, 28 Jan 2015 23:22:43 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0SNMhDU025445;
 Wed, 28 Jan 2015 23:22:43 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201501282322.t0SNMhDU025445@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Wed, 28 Jan 2015 23:22:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r277866 - vendor/amd/dist/amd
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
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/options/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: Wed, 28 Jan 2015 23:22:43 -0000

Author: pfg
Date: Wed Jan 28 23:22:42 2015
New Revision: 277866
URL: https://svnweb.freebsd.org/changeset/base/277866

Log:
  avoid possible null pointer deref (coverity)
  
  author	Christos Zoulas <christos@zoulas.com>
  	Wed, 17 Sep 2008 15:07:20 -0500 (20:07 +0000)
  committer	Christos Zoulas <christos@zoulas.com>
  	Wed, 17 Sep 2008 15:07:20 -0500 (20:07 +0000)
  commit	d414de481f6efe52455c19f64e911d0db34d185a

Modified:
  vendor/amd/dist/amd/amfs_generic.c

Modified: vendor/amd/dist/amd/amfs_generic.c
==============================================================================
--- vendor/amd/dist/amd/amfs_generic.c	Wed Jan 28 23:13:12 2015	(r277865)
+++ vendor/amd/dist/amd/amfs_generic.c	Wed Jan 28 23:22:42 2015	(r277866)
@@ -1113,7 +1113,7 @@ amfs_generic_mount_child(am_node *new_mp
     new_mp->am_transp = (SVCXPRT *) xmalloc(sizeof(SVCXPRT));
     *(new_mp->am_transp) = *current_transp;
   }
-  if (error && (new_mp->am_mnt->mf_ops == &amfs_error_ops))
+  if (error && new_mp->am_mnt && (new_mp->am_mnt->mf_ops == &amfs_error_ops))
     new_mp->am_error = error;
 
   if (new_mp->am_error > 0)