OpenZFS 6764 - zfs issues with inheritance flags during chmod(2)
with aclmode=passthrough Authored by: Albert Lee <trisk@nexenta.com> Reviewed by: Gordon Ross <gwr@nexenta.com> Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com> Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov> Approved by: Richard Lowe <richlowe@richlowe.net> Ported-by: Paul B. Henson <henson@acm.org> OpenZFS-issue: https://www.illumos.org/issues/6764 OpenZFS-commit: https://github.com/openzfs/openzfs/commit/de0f1ddb59 Closes #10266
This commit is contained in:
Paul B. Henson
Brian Behlendorf
parent
7bf3e1fa0f
commit
5a2f527d4b
|
|
@ -879,7 +879,6 @@ zfs_set_ace(zfs_acl_t *aclp, void *acep, uint32_t access_mask,
|
|||
|
||||
/*
|
||||
* Determine mode of file based on ACL.
|
||||
* Also, create FUIDs for any User/Group ACEs
|
||||
*/
|
||||
uint64_t
|
||||
zfs_mode_compute(uint64_t fmode, zfs_acl_t *aclp,
|
||||
|
|
@ -905,11 +904,9 @@ zfs_mode_compute(uint64_t fmode, zfs_acl_t *aclp,
|
|||
entry_type = (iflags & ACE_TYPE_FLAGS);
|
||||
|
||||
/*
|
||||
* Skip over owner@, group@ or everyone@ inherit only ACEs
|
||||
* Skip over any inherit_only ACEs
|
||||
*/
|
||||
if ((iflags & ACE_INHERIT_ONLY_ACE) &&
|
||||
(entry_type == ACE_OWNER || entry_type == ACE_EVERYONE ||
|
||||
entry_type == OWNING_GROUP))
|
||||
if (iflags & ACE_INHERIT_ONLY_ACE)
|
||||
continue;
|
||||
|
||||
if (entry_type == ACE_OWNER || (entry_type == 0 &&
|
||||
|
|
@ -1487,7 +1484,8 @@ zfs_aclset_common(znode_t *zp, zfs_acl_t *aclp, cred_t *cr, dmu_tx_t *tx)
|
|||
}
|
||||
|
||||
static void
|
||||
zfs_acl_chmod(boolean_t isdir, uint64_t mode, boolean_t trim, zfs_acl_t *aclp)
|
||||
zfs_acl_chmod(boolean_t isdir, uint64_t mode, boolean_t split, boolean_t trim,
|
||||
zfs_acl_t *aclp)
|
||||
{
|
||||
void *acep = NULL;
|
||||
uint64_t who;
|
||||
|
|
@ -1529,15 +1527,27 @@ zfs_acl_chmod(boolean_t isdir, uint64_t mode, boolean_t trim, zfs_acl_t *aclp)
|
|||
|
||||
while ((acep = zfs_acl_next_ace(aclp, acep, &who, &access_mask,
|
||||
&iflags, &type))) {
|
||||
uint16_t inherit_flags;
|
||||
|
||||
entry_type = (iflags & ACE_TYPE_FLAGS);
|
||||
inherit_flags = (iflags & ALL_INHERIT);
|
||||
|
||||
if ((entry_type == ACE_OWNER || entry_type == ACE_EVERYONE ||
|
||||
(entry_type == OWNING_GROUP)) &&
|
||||
((inherit_flags & ACE_INHERIT_ONLY_ACE) == 0)) {
|
||||
/*
|
||||
* ACEs used to represent the file mode may be divided
|
||||
* into an equivalent pair of inherit-only and regular
|
||||
* ACEs, if they are inheritable.
|
||||
* Skip regular ACEs, which are replaced by the new mode.
|
||||
*/
|
||||
if (split && (entry_type == ACE_OWNER ||
|
||||
entry_type == OWNING_GROUP ||
|
||||
entry_type == ACE_EVERYONE)) {
|
||||
if (!isdir || !(iflags &
|
||||
(ACE_FILE_INHERIT_ACE|ACE_DIRECTORY_INHERIT_ACE)))
|
||||
continue;
|
||||
/*
|
||||
* We preserve owner@, group@, or @everyone
|
||||
* permissions, if they are inheritable, by
|
||||
* copying them to inherit_only ACEs. This
|
||||
* prevents inheritable permissions from being
|
||||
* altered along with the file mode.
|
||||
*/
|
||||
iflags |= ACE_INHERIT_ONLY_ACE;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1545,12 +1555,12 @@ zfs_acl_chmod(boolean_t isdir, uint64_t mode, boolean_t trim, zfs_acl_t *aclp)
|
|||
* the hints (which are later masked into the pflags)
|
||||
* so create knows to do inheritance.
|
||||
*/
|
||||
if (isdir && (inherit_flags &
|
||||
if (isdir && (iflags &
|
||||
(ACE_FILE_INHERIT_ACE|ACE_DIRECTORY_INHERIT_ACE)))
|
||||
aclp->z_hints |= ZFS_INHERIT_ACE;
|
||||
|
||||
if ((type != ALLOW && type != DENY) ||
|
||||
(inherit_flags & ACE_INHERIT_ONLY_ACE)) {
|
||||
(iflags & ACE_INHERIT_ONLY_ACE)) {
|
||||
switch (type) {
|
||||
case ACE_ACCESS_ALLOWED_OBJECT_ACE_TYPE:
|
||||
case ACE_ACCESS_DENIED_OBJECT_ACE_TYPE:
|
||||
|
|
@ -1560,7 +1570,6 @@ zfs_acl_chmod(boolean_t isdir, uint64_t mode, boolean_t trim, zfs_acl_t *aclp)
|
|||
break;
|
||||
}
|
||||
} else {
|
||||
|
||||
/*
|
||||
* Limit permissions to be no greater than
|
||||
* group permissions.
|
||||
|
|
@ -1577,11 +1586,11 @@ zfs_acl_chmod(boolean_t isdir, uint64_t mode, boolean_t trim, zfs_acl_t *aclp)
|
|||
new_count++;
|
||||
new_bytes += ace_size;
|
||||
}
|
||||
zfs_set_ace(aclp, zacep, masks.owner, 0, -1, ACE_OWNER);
|
||||
zfs_set_ace(aclp, zacep, masks.owner, ALLOW, -1, ACE_OWNER);
|
||||
zacep = (void *)((uintptr_t)zacep + abstract_size);
|
||||
zfs_set_ace(aclp, zacep, masks.group, 0, -1, OWNING_GROUP);
|
||||
zfs_set_ace(aclp, zacep, masks.group, ALLOW, -1, OWNING_GROUP);
|
||||
zacep = (void *)((uintptr_t)zacep + abstract_size);
|
||||
zfs_set_ace(aclp, zacep, masks.everyone, 0, -1, ACE_EVERYONE);
|
||||
zfs_set_ace(aclp, zacep, masks.everyone, ALLOW, -1, ACE_EVERYONE);
|
||||
|
||||
new_count += 3;
|
||||
new_bytes += abstract_size * 3;
|
||||
|
|
@ -1607,7 +1616,7 @@ zfs_acl_chmod_setattr(znode_t *zp, zfs_acl_t **aclp, uint64_t mode)
|
|||
|
||||
if (error == 0) {
|
||||
(*aclp)->z_hints = zp->z_pflags & V4_ACL_WIDE_FLAGS;
|
||||
zfs_acl_chmod(S_ISDIR(ZTOI(zp)->i_mode), mode,
|
||||
zfs_acl_chmod(S_ISDIR(ZTOI(zp)->i_mode), mode, B_TRUE,
|
||||
(ZTOZSB(zp)->z_acl_mode == ZFS_ACL_GROUPMASK), *aclp);
|
||||
}
|
||||
mutex_exit(&zp->z_lock);
|
||||
|
|
@ -1616,21 +1625,6 @@ zfs_acl_chmod_setattr(znode_t *zp, zfs_acl_t **aclp, uint64_t mode)
|
|||
return (error);
|
||||
}
|
||||
|
||||
/*
|
||||
* strip off write_owner and write_acl
|
||||
*/
|
||||
static void
|
||||
zfs_restricted_update(zfsvfs_t *zfsvfs, zfs_acl_t *aclp, void *acep)
|
||||
{
|
||||
uint32_t mask = aclp->z_ops->ace_mask_get(acep);
|
||||
|
||||
if ((zfsvfs->z_acl_inherit == ZFS_ACL_RESTRICTED) &&
|
||||
(aclp->z_ops->ace_type_get(acep) == ALLOW)) {
|
||||
mask &= ~RESTRICTED_CLEAR;
|
||||
aclp->z_ops->ace_mask_set(acep, mask);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Should ACE be inherited?
|
||||
*/
|
||||
|
|
@ -1651,10 +1645,10 @@ zfs_ace_can_use(umode_t obj_mode, uint16_t acep_flags)
|
|||
* inherit inheritable ACEs from parent
|
||||
*/
|
||||
static zfs_acl_t *
|
||||
zfs_acl_inherit(zfsvfs_t *zfsvfs, umode_t obj_mode, zfs_acl_t *paclp,
|
||||
uint64_t mode, boolean_t *need_chmod)
|
||||
zfs_acl_inherit(zfsvfs_t *zfsvfs, umode_t va_mode, zfs_acl_t *paclp,
|
||||
uint64_t mode)
|
||||
{
|
||||
void *pacep;
|
||||
void *pacep = NULL;
|
||||
void *acep;
|
||||
zfs_acl_node_t *aclnode;
|
||||
zfs_acl_t *aclp = NULL;
|
||||
|
|
@ -1664,22 +1658,14 @@ zfs_acl_inherit(zfsvfs_t *zfsvfs, umode_t obj_mode, zfs_acl_t *paclp,
|
|||
size_t ace_size;
|
||||
void *data1, *data2;
|
||||
size_t data1sz, data2sz;
|
||||
boolean_t vdir = S_ISDIR(obj_mode);
|
||||
boolean_t vreg = S_ISREG(obj_mode);
|
||||
boolean_t passthrough, passthrough_x, noallow;
|
||||
uint_t aclinherit;
|
||||
boolean_t isdir = S_ISDIR(va_mode);
|
||||
|
||||
passthrough_x =
|
||||
zfsvfs->z_acl_inherit == ZFS_ACL_PASSTHROUGH_X;
|
||||
passthrough = passthrough_x ||
|
||||
zfsvfs->z_acl_inherit == ZFS_ACL_PASSTHROUGH;
|
||||
noallow =
|
||||
zfsvfs->z_acl_inherit == ZFS_ACL_NOALLOW;
|
||||
|
||||
*need_chmod = B_TRUE;
|
||||
pacep = NULL;
|
||||
aclp = zfs_acl_alloc(paclp->z_version);
|
||||
if (zfsvfs->z_acl_inherit == ZFS_ACL_DISCARD || S_ISLNK(obj_mode))
|
||||
aclinherit = zfsvfs->z_acl_inherit;
|
||||
if (aclinherit == ZFS_ACL_DISCARD || S_ISLNK(va_mode))
|
||||
return (aclp);
|
||||
|
||||
while ((pacep = zfs_acl_next_ace(paclp, pacep, &who,
|
||||
&access_mask, &iflags, &type))) {
|
||||
|
||||
|
|
@ -1689,31 +1675,31 @@ zfs_acl_inherit(zfsvfs_t *zfsvfs, umode_t obj_mode, zfs_acl_t *paclp,
|
|||
if (!zfs_acl_valid_ace_type(type, iflags))
|
||||
continue;
|
||||
|
||||
if (noallow && type == ALLOW)
|
||||
continue;
|
||||
|
||||
ace_size = aclp->z_ops->ace_size(pacep);
|
||||
|
||||
if (!zfs_ace_can_use(obj_mode, iflags))
|
||||
/*
|
||||
* Check if ACE is inheritable by this vnode
|
||||
*/
|
||||
if ((aclinherit == ZFS_ACL_NOALLOW && type == ALLOW) ||
|
||||
!zfs_ace_can_use(va_mode, iflags))
|
||||
continue;
|
||||
|
||||
/*
|
||||
* If owner@, group@, or everyone@ inheritable
|
||||
* then zfs_acl_chmod() isn't needed.
|
||||
* Strip inherited execute permission from file if
|
||||
* not in mode
|
||||
*/
|
||||
if (passthrough &&
|
||||
((iflags & (ACE_OWNER|ACE_EVERYONE)) ||
|
||||
((iflags & OWNING_GROUP) ==
|
||||
OWNING_GROUP)) && (vreg || (vdir && (iflags &
|
||||
ACE_DIRECTORY_INHERIT_ACE)))) {
|
||||
*need_chmod = B_FALSE;
|
||||
}
|
||||
|
||||
if (!vdir && passthrough_x &&
|
||||
((mode & (S_IXUSR | S_IXGRP | S_IXOTH)) == 0)) {
|
||||
if (aclinherit == ZFS_ACL_PASSTHROUGH_X && type == ALLOW &&
|
||||
!isdir && ((mode & (S_IXUSR|S_IXGRP|S_IXOTH)) == 0)) {
|
||||
access_mask &= ~ACE_EXECUTE;
|
||||
}
|
||||
|
||||
/*
|
||||
* Strip write_acl and write_owner from permissions
|
||||
* when inheriting an ACE
|
||||
*/
|
||||
if (aclinherit == ZFS_ACL_RESTRICTED && type == ALLOW) {
|
||||
access_mask &= ~RESTRICTED_CLEAR;
|
||||
}
|
||||
|
||||
ace_size = aclp->z_ops->ace_size(pacep);
|
||||
aclnode = zfs_acl_node_alloc(ace_size);
|
||||
list_insert_tail(&aclp->z_acl, aclnode);
|
||||
acep = aclnode->z_acldata;
|
||||
|
|
@ -1735,18 +1721,21 @@ zfs_acl_inherit(zfsvfs_t *zfsvfs, umode_t obj_mode, zfs_acl_t *paclp,
|
|||
aclp->z_acl_bytes += aclnode->z_size;
|
||||
newflags = aclp->z_ops->ace_flags_get(acep);
|
||||
|
||||
if (vdir)
|
||||
aclp->z_hints |= ZFS_INHERIT_ACE;
|
||||
|
||||
if ((iflags & ACE_NO_PROPAGATE_INHERIT_ACE) || !vdir) {
|
||||
/*
|
||||
* If ACE is not to be inherited further, or if the vnode is
|
||||
* not a directory, remove all inheritance flags
|
||||
*/
|
||||
if (!isdir || (iflags & ACE_NO_PROPAGATE_INHERIT_ACE)) {
|
||||
newflags &= ~ALL_INHERIT;
|
||||
aclp->z_ops->ace_flags_set(acep,
|
||||
newflags|ACE_INHERITED_ACE);
|
||||
zfs_restricted_update(zfsvfs, aclp, acep);
|
||||
continue;
|
||||
}
|
||||
|
||||
ASSERT(vdir);
|
||||
/*
|
||||
* This directory has an inheritable ACE
|
||||
*/
|
||||
aclp->z_hints |= ZFS_INHERIT_ACE;
|
||||
|
||||
/*
|
||||
* If only FILE_INHERIT is set then turn on
|
||||
|
|
@ -1763,12 +1752,14 @@ zfs_acl_inherit(zfsvfs_t *zfsvfs, umode_t obj_mode, zfs_acl_t *paclp,
|
|||
newflags|ACE_INHERITED_ACE);
|
||||
}
|
||||
}
|
||||
|
||||
return (aclp);
|
||||
}
|
||||
|
||||
/*
|
||||
* Create file system object initial permissions
|
||||
* including inheritable ACEs.
|
||||
* Also, create FUIDs for owner and group.
|
||||
*/
|
||||
int
|
||||
zfs_acl_ids_create(znode_t *dzp, int flag, vattr_t *vap, cred_t *cr,
|
||||
|
|
@ -1778,7 +1769,7 @@ zfs_acl_ids_create(znode_t *dzp, int flag, vattr_t *vap, cred_t *cr,
|
|||
zfsvfs_t *zfsvfs = ZTOZSB(dzp);
|
||||
zfs_acl_t *paclp;
|
||||
gid_t gid = vap->va_gid;
|
||||
boolean_t need_chmod = B_TRUE;
|
||||
boolean_t trim = B_FALSE;
|
||||
boolean_t inherited = B_FALSE;
|
||||
|
||||
bzero(acl_ids, sizeof (zfs_acl_ids_t));
|
||||
|
|
@ -1871,7 +1862,7 @@ zfs_acl_ids_create(znode_t *dzp, int flag, vattr_t *vap, cred_t *cr,
|
|||
VERIFY(0 == zfs_acl_node_read(dzp, B_TRUE,
|
||||
&paclp, B_FALSE));
|
||||
acl_ids->z_aclp = zfs_acl_inherit(zfsvfs,
|
||||
vap->va_mode, paclp, acl_ids->z_mode, &need_chmod);
|
||||
vap->va_mode, paclp, acl_ids->z_mode);
|
||||
inherited = B_TRUE;
|
||||
} else {
|
||||
acl_ids->z_aclp =
|
||||
|
|
@ -1880,13 +1871,16 @@ zfs_acl_ids_create(znode_t *dzp, int flag, vattr_t *vap, cred_t *cr,
|
|||
}
|
||||
mutex_exit(&dzp->z_lock);
|
||||
mutex_exit(&dzp->z_acl_lock);
|
||||
if (need_chmod) {
|
||||
acl_ids->z_aclp->z_hints |= S_ISDIR(vap->va_mode) ?
|
||||
ZFS_ACL_AUTO_INHERIT : 0;
|
||||
zfs_acl_chmod(S_ISDIR(vap->va_mode), acl_ids->z_mode,
|
||||
(zfsvfs->z_acl_inherit == ZFS_ACL_RESTRICTED),
|
||||
acl_ids->z_aclp);
|
||||
}
|
||||
|
||||
if (S_ISDIR(vap->va_mode))
|
||||
acl_ids->z_aclp->z_hints |= ZFS_ACL_AUTO_INHERIT;
|
||||
|
||||
if (zfsvfs->z_acl_mode == ZFS_ACL_GROUPMASK &&
|
||||
zfsvfs->z_acl_inherit != ZFS_ACL_PASSTHROUGH &&
|
||||
zfsvfs->z_acl_inherit != ZFS_ACL_PASSTHROUGH_X)
|
||||
trim = B_TRUE;
|
||||
zfs_acl_chmod(S_ISDIR(vap->va_mode), acl_ids->z_mode, B_FALSE,
|
||||
trim, acl_ids->z_aclp);
|
||||
}
|
||||
|
||||
if (inherited || vsecp) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue