From owner-p4-projects@FreeBSD.ORG  Tue Aug 12 10:03:36 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 895D9106566B; Tue, 12 Aug 2008 10:03:36 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4DABA1065675
	for <perforce@freebsd.org>; Tue, 12 Aug 2008 10:03:36 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3EB868FC1A
	for <perforce@freebsd.org>; Tue, 12 Aug 2008 10:03:36 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7CA3arj093490
	for <perforce@freebsd.org>; Tue, 12 Aug 2008 10:03:36 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7CA3a5B093488
	for perforce@freebsd.org; Tue, 12 Aug 2008 10:03:36 GMT
	(envelope-from trasz@freebsd.org)
Date: Tue, 12 Aug 2008 10:03:36 GMT
Message-Id: <200808121003.m7CA3a5B093488@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 147221 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Aug 2008 10:03:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=147221

Change 147221 by trasz@trasz_traszkan on 2008/08/12 10:03:34

	Verify ACLs loaded from disk.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#10 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#10 (text+ko) ====

@@ -195,10 +195,11 @@
 		return (EPERM);
 	}
 
-	if (ap->a_aclp->acl_cnt > ap->a_aclp->acl_length) {
+
+	error = acl_nfs4_check(ap->a_aclp, ap->a_vp->v_type == VDIR);
+	if (error) {
 		printf("ufs_getacl_nfs4(): Loaded invalid ACL "
-		    "(wrong acl_cnt: %c), inumber %d on %s\n",
-		    ap->a_aclp->acl_cnt,
+		    "(failed acl_nfs4_check), inumber %d on %s\n",
 		    ip->i_number, ip->i_fs->fs_fsmnt);
 
 		return (EPERM);