PSARC/2007/218 caller_context_t in all VOPs

PSARC/2007/227 VFS Feature Registration and ACL on Create
PSARC/2007/244 ZFS Case-insensitive support
PSARC/2007/315 Extensible Attribute Interfaces
PSARC/2007/394 ls(1) new command line options '-/' and '-%': CIFS system attributes support
PSARC/2007/403 Modified Access Checks for CIFS
PSARC/2007/410 Add system attribute support to chmod(1)
PSARC/2007/432 CIFS system attributes support for cp(1), pack(1), unpack(1), compress(1) and uncompress(1)
PSARC/2007/444 Rescind SETTABLE Attribute
PSARC/2007/459 CIFS system attributes support for cpio(1), pax(1), tar(1)
PSARC/2007/546 Update utilities to match CIFS system attributes changes.
PSARC/2007/560 ZFS sharesmb property
4890717 want append-only files
6417428 Case-insensitive file system name lookup to support CIFS
6417435 DOS attributes and additional timestamps to support for CIFS
6417442 File system quarantined and modified attributes to support an integrated Anti-Virus service
6417453 FS boolean property for rejecting/allowing invalid UTF-8 sequences in file names
6473733 RFE: Need support for open-deny modes
6473755 RFE:  Need ability to reconcile oplock and delegation conflicts
6494624 sharemgr needs to support CIFS shares better
6546705 All vnode operations need to pass caller_context_t
6546706 Need VOP_SETATTR/VOP_GETATTR to support new, optional attributes
6546893 Solaris system attribute support
6550962 ZFS ACL inheritance needs to be enhanced to support Automatic Inheritance
6553589 RFE: VFS Feature Registration facility
6553770 RFE: ZFS support for ACL-on-CREATE (PSARC 2007/227)
6565581 ls(1) should support file system attributes proposed in PSARC/2007/315
6566784 NTFS streams are not copied along with the files.
6576205 cp(1), pack(1) and compress(1) should support file system attributes proposed in PSARC/2007/315
6578875 RFE: kernel interfaces for nbmand need improvement
6578883 RFE: VOP_SHRLOCK needs additional access types
6578885 chmod(1) should support file system attributes proposed in PSARC/2007/315
6578886 RFE: disallow nbmand state to change on remount
6583349 ACL parser needs to support audit/alarm ACE types
6590347 tar(1) should support filesystem attributes proposed in PSARC/2007/315
6597357 *tar* xv@ doesn't show the hidden directory even though it is restored
6597360 *tar* should re-init xattr info if openat() fails during extraction of and extended attribute
6597368 *tar* cannot restore hard linked extended attributes
6597374 *tar* doesn't display "x " when hard linked attributes are restored
6597375 *tar* extended attribute header off by one
6614861 *cpio* incorrectly archives extended system attributes with -@
6614896 *pax* incorrectly archives extended system attributes with -@
6615225 *tar* incorrectly archives extended system attributes with -@
6617183 CIFS Service - PSARC 2006/715

1 files changed, 16 insertions, 12 deletions

diff --git a/usr/src/uts/common/syscall/acl.c b/usr/src/uts/common/syscall/acl.c
index 1a7321928d..5c2fe3a9bc 100644
--- a/usr/src/uts/common/syscall/acl.c
+++ b/usr/src/uts/common/syscall/acl.c
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -133,6 +133,7 @@ cacl(int cmd, int nentries, void *aclbufp, vnode_t *vp, int *rv)
 	caddr_t		uaddrp;
 	aclent_t	*aclp, *aaclp;
 	vsecattr_t	vsecattr;
+	size_t		entry_size;
 
 	ASSERT(vp);
 
@@ -142,20 +143,23 @@ cacl(int cmd, int nentries, void *aclbufp, vnode_t *vp, int *rv)
 
 	case ACE_GETACLCNT:
 	case GETACLCNT:
-		if (cmd == GETACLCNT)
+		if (cmd == GETACLCNT) {
+			entry_size = sizeof (aclent_t);
 			vsecattr.vsa_mask = VSA_ACLCNT | VSA_DFACLCNT;
-		else
+		} else {
+			entry_size = sizeof (ace_t);
 			vsecattr.vsa_mask = VSA_ACECNT;
-		if (error = VOP_GETSECATTR(vp, &vsecattr, 0, CRED()))
+		}
+		if (error = VOP_GETSECATTR(vp, &vsecattr, 0, CRED(), NULL))
 			return (error);
 		*rv = vsecattr.vsa_aclcnt + vsecattr.vsa_dfaclcnt;
 		if (vsecattr.vsa_aclcnt && vsecattr.vsa_aclentp) {
 			kmem_free(vsecattr.vsa_aclentp,
-			    vsecattr.vsa_aclcnt * sizeof (aclent_t));
+			    vsecattr.vsa_aclcnt * entry_size);
 		}
 		if (vsecattr.vsa_dfaclcnt && vsecattr.vsa_dfaclentp) {
 			kmem_free(vsecattr.vsa_dfaclentp,
-			    vsecattr.vsa_dfaclcnt * sizeof (aclent_t));
+			    vsecattr.vsa_dfaclcnt * entry_size);
 		}
 		break;
 	case GETACL:
@@ -172,7 +176,7 @@ cacl(int cmd, int nentries, void *aclbufp, vnode_t *vp, int *rv)
 			return (EFAULT);
 		vsecattr.vsa_mask = VSA_ACL | VSA_ACLCNT | VSA_DFACL |
 		    VSA_DFACLCNT;
-		if (error = VOP_GETSECATTR(vp, &vsecattr, 0, CRED()))
+		if (error = VOP_GETSECATTR(vp, &vsecattr, 0, CRED(), NULL))
 			return (error);
 		/* Check user's buffer is big enough */
 		numacls = vsecattr.vsa_aclcnt + vsecattr.vsa_dfaclcnt;
@@ -222,7 +226,7 @@ cacl(int cmd, int nentries, void *aclbufp, vnode_t *vp, int *rv)
 			return (EFAULT);
 
 		vsecattr.vsa_mask = VSA_ACE | VSA_ACECNT;
-		if (error = VOP_GETSECATTR(vp, &vsecattr, 0, CRED()))
+		if (error = VOP_GETSECATTR(vp, &vsecattr, 0, CRED(), NULL))
 			return (error);
 
 		aclbsize = vsecattr.vsa_aclcnt * sizeof (ace_t);
@@ -240,8 +244,7 @@ cacl(int cmd, int nentries, void *aclbufp, vnode_t *vp, int *rv)
 
 		*rv = vsecattr.vsa_aclcnt;
 		if (vsecattr.vsa_aclcnt) {
-			kmem_free(vsecattr.vsa_aclentp,
-			    vsecattr.vsa_aclcnt * sizeof (ace_t));
+			kmem_free(vsecattr.vsa_aclentp, vsecattr.vsa_aclentsz);
 		}
 		break;
 
@@ -300,7 +303,7 @@ cacl(int cmd, int nentries, void *aclbufp, vnode_t *vp, int *rv)
 			return (ENOTDIR);
 		}
 		(void) VOP_RWLOCK(vp, V_WRITELOCK_TRUE, NULL);
-		if (error = VOP_SETSECATTR(vp, &vsecattr, 0, CRED())) {
+		if (error = VOP_SETSECATTR(vp, &vsecattr, 0, CRED(), NULL)) {
 			kmem_free(aaclp, aclbsize);
 			VOP_RWUNLOCK(vp, V_WRITELOCK_TRUE, NULL);
 			return (error);
@@ -327,13 +330,14 @@ cacl(int cmd, int nentries, void *aclbufp, vnode_t *vp, int *rv)
 		vsecattr.vsa_aclentp = kmem_alloc(aclbsize, KM_SLEEP);
 		aaclp = vsecattr.vsa_aclentp;
 		vsecattr.vsa_aclcnt = nentries;
+		vsecattr.vsa_aclentsz = aclbsize;
 		uaddrp = (caddr_t)aclbufp;
 		if (copyin(uaddrp, vsecattr.vsa_aclentp, aclbsize)) {
 			kmem_free(aaclp, aclbsize);
 			return (EFAULT);
 		}
 		(void) VOP_RWLOCK(vp, V_WRITELOCK_TRUE, NULL);
-		if (error = VOP_SETSECATTR(vp, &vsecattr, 0, CRED())) {
+		if (error = VOP_SETSECATTR(vp, &vsecattr, 0, CRED(), NULL)) {
 			kmem_free(aaclp, aclbsize);
 			VOP_RWUNLOCK(vp, V_WRITELOCK_TRUE, NULL);
 			return (error);