From owner-svn-src-head@FreeBSD.ORG  Thu Jan 29 01:28:39 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DC1DFBFF;
 Thu, 29 Jan 2015 01:28:39 +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 C7D32196;
 Thu, 29 Jan 2015 01:28:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0T1Sdq3085096;
 Thu, 29 Jan 2015 01:28:39 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0T1SdGL085095;
 Thu, 29 Jan 2015 01:28:39 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201501290128.t0T1SdGL085095@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: Thu, 29 Jan 2015 01:28:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r277869 - head/contrib/amd/amd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Jan 2015 01:28:40 -0000

Author: pfg
Date: Thu Jan 29 01:28:39 2015
New Revision: 277869
URL: https://svnweb.freebsd.org/changeset/base/277869

Log:
  MFV	r277866
  amd: Add extra check for NULL before deref.
  
  CID:		274421
  Obtained from:	NetBSD
  MFC after:	4 days

Modified:
  head/contrib/amd/amd/amfs_generic.c
Directory Properties:
  head/contrib/amd/   (props changed)

Modified: head/contrib/amd/amd/amfs_generic.c
==============================================================================
--- head/contrib/amd/amd/amfs_generic.c	Thu Jan 29 01:26:23 2015	(r277868)
+++ head/contrib/amd/amd/amfs_generic.c	Thu Jan 29 01:28:39 2015	(r277869)
@@ -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)