From owner-svn-src-stable-9@FreeBSD.ORG  Tue Feb  3 14:37:39 2015
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@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 58781499;
 Tue,  3 Feb 2015 14:37: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 444C27F9;
 Tue,  3 Feb 2015 14:37: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 t13EbdDh084281;
 Tue, 3 Feb 2015 14:37:39 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13EbcXL084279;
 Tue, 3 Feb 2015 14:37:38 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201502031437.t13EbcXL084279@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: Tue, 3 Feb 2015 14:37:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r278156 - in stable/9/contrib/amd: amd hlfsd
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9/>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Feb 2015 14:37:39 -0000

Author: pfg
Date: Tue Feb  3 14:37:38 2015
New Revision: 278156
URL: https://svnweb.freebsd.org/changeset/base/278156

Log:
  MFV	r277814, r277868, r277869:
  amd: Add extra check for NULL before deref.
  
  MFV	r277841:
  Fix a clang 3.6.0 warning (from dim)
  
  CID:		274421
  Obtained from:	NetBSD
  MFC after:	4 days

Modified:
  stable/9/contrib/amd/amd/amfs_generic.c
  stable/9/contrib/amd/hlfsd/homedir.c
Directory Properties:
  stable/9/contrib/amd/   (props changed)

Modified: stable/9/contrib/amd/amd/amfs_generic.c
==============================================================================
--- stable/9/contrib/amd/amd/amfs_generic.c	Tue Feb  3 14:36:48 2015	(r278155)
+++ stable/9/contrib/amd/amd/amfs_generic.c	Tue Feb  3 14:37:38 2015	(r278156)
@@ -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)

Modified: stable/9/contrib/amd/hlfsd/homedir.c
==============================================================================
--- stable/9/contrib/amd/hlfsd/homedir.c	Tue Feb  3 14:36:48 2015	(r278155)
+++ stable/9/contrib/amd/hlfsd/homedir.c	Tue Feb  3 14:37:38 2015	(r278156)
@@ -494,7 +494,7 @@ readent:
   buf[0] = '\0';
   fgets(buf, 256, passwd_fp);
   passwd_line++;
-  if (!buf || buf[0] == '\0')
+  if (buf[0] == '\0')
     goto readent;
 
   /* read user name */