Date: Fri, 15 Aug 2008 09:14:57 GMT From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 147429 for review Message-ID: <200808150914.m7F9EvbU054807@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808150914.m7F9EvbU054807>