svn commit: r224853 - stable/8/sys/fs/nfs

[Zack Kirsch]

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 {