From owner-p4-projects@FreeBSD.ORG  Fri Aug 15 09:14:58 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3BF4D106567C; Fri, 15 Aug 2008 09:14:58 +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 0038B1065672
	for <perforce@freebsd.org>; Fri, 15 Aug 2008 09:14:57 +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 D55FD8FC0A
	for <perforce@freebsd.org>; Fri, 15 Aug 2008 09:14:57 +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 m7F9EvoJ054809
	for <perforce@freebsd.org>; Fri, 15 Aug 2008 09:14:57 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7F9EvbU054807
	for perforce@freebsd.org; Fri, 15 Aug 2008 09:14:57 GMT
	(envelope-from trasz@freebsd.org)
Date: Fri, 15 Aug 2008 09:14:57 GMT
Message-Id: <200808150914.m7F9EvbU054807@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 147429 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: Fri, 15 Aug 2008 09:14:58 -0000

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

Change 147429 by trasz@trasz_traszkan on 2008/08/15 09:14:32

	Don't panic with null pointer dereference on setfacl -k.

Affected files ...

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

Differences ...

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

@@ -479,6 +479,10 @@
 		    ap->a_cred, ap->a_td);
 		if (error != 0)
 			return (error);
+
+		error = acl_copy_acl_into_oldacl(ap->a_aclp, &old);
+		if (error)
+			return (error);
 	} else {
 		/*
 		 * Delete operation.
@@ -506,10 +510,6 @@
 	if ((error = VOP_ACCESS(ap->a_vp, VADMIN, ap->a_cred, ap->a_td)))
 		return (error);
 
-	error = acl_copy_acl_into_oldacl(ap->a_aclp, &old);
-	if (error)
-		return (error);
-
 	switch(ap->a_type) {
 	case ACL_TYPE_ACCESS:
 		error = vn_extattr_set(ap->a_vp, IO_NODELOCKED,