From owner-svn-src-stable-8@FreeBSD.ORG  Sat Aug 13 17:29:38 2011
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0BAC3106566C;
	Sat, 13 Aug 2011 17:29:38 +0000 (UTC)
	(envelope-from zack@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EF6E88FC17;
	Sat, 13 Aug 2011 17:29:37 +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 p7DHTbbt026335;
	Sat, 13 Aug 2011 17:29:37 GMT (envelope-from zack@svn.freebsd.org)
Received: (from zack@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7DHTbVl026333;
	Sat, 13 Aug 2011 17:29:37 GMT (envelope-from zack@svn.freebsd.org)
Message-Id: <201108131729.p7DHTbVl026333@svn.freebsd.org>
From: Zack Kirsch <zack@FreeBSD.org>
Date: Sat, 13 Aug 2011 17:29:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224853 - stable/8/sys/fs/nfs
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Aug 2011 17:29:38 -0000

Author: zack
Date: Sat Aug 13 17:29:37 2011
New Revision: 224853
URL: http://svn.freebsd.org/changeset/base/224853

Log:
  MFC r224079 and r224121:
  
  r224121 was meant to revert r224079, except I accidentally checked in an
  additional ACL patch in r224121. Committing both of these ends up with just the
  ACL fix. Here is the real commit note for the ACL patch:
  
  Running pynfs verify/nverify tests produces a panic in nfsrv_compareacl(). This
  patch fixes the panic.

Modified:
  stable/8/sys/fs/nfs/nfs_commonsubs.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/fs/nfs/nfs_commonsubs.c
==============================================================================
--- stable/8/sys/fs/nfs/nfs_commonsubs.c	Sat Aug 13 17:22:16 2011	(r224852)
+++ stable/8/sys/fs/nfs/nfs_commonsubs.c	Sat Aug 13 17:29:37 2011	(r224853)
@@ -1037,7 +1037,8 @@ nfsv4_loadattr(struct nfsrv_descript *nd
 				    acl_free(naclp);
 				    goto nfsmout;
 				}
-				if (aceerr || nfsrv_compareacl(aclp, naclp))
+				if (aceerr || aclp == NULL ||
+				    nfsrv_compareacl(aclp, naclp))
 				    *retcmpp = NFSERR_NOTSAME;
 				acl_free(naclp);
 			    } else {