diff options
| author | trasz <trasz@FreeBSD.org> | 2010-05-17 17:56:27 +0000 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2010-05-17 17:56:27 +0000 |
| commit | 5a547a114ee172a609ee64776b14d9c540585225 (patch) | |
| tree | e81ed93f562cc4405a4d148f083575bef606beed | |
| parent | 4356fc7abd2bf50962c138423983ce4fc15a43fd (diff) | |
| download | FreeBSD-src-5a547a114ee172a609ee64776b14d9c540585225.zip FreeBSD-src-5a547a114ee172a609ee64776b14d9c540585225.tar.gz | |
MFC r208030:
Add missing check to prevent local users from panicing the kernel by trying
to set malformed ACL.
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c index 59a58dd..12df0a1 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c @@ -4936,6 +4936,10 @@ zfs_freebsd_setacl(ap) if (ap->a_aclp->acl_cnt * 2 + 6 > ACL_MAX_ENTRIES) return (ENOSPC); + error = acl_nfs4_check(ap->a_aclp, ap->a_vp->v_type == VDIR); + if (error != 0) + return (error); + vsecattr.vsa_mask = VSA_ACE; aclbsize = ap->a_aclp->acl_cnt * sizeof(ace_t); vsecattr.vsa_aclentp = kmem_alloc(aclbsize, KM_SLEEP); |
