Commit 177b55a5 authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Greg Kroah-Hartman

ovl: remove posix_acl_default from workdir

commit c11b9fdd upstream.

Clear out posix acl xattrs on workdir and also reset the mode after
creation so that an inherited sgid bit is cleared.
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5737dae5
...@@ -798,6 +798,10 @@ static struct dentry *ovl_workdir_create(struct vfsmount *mnt, ...@@ -798,6 +798,10 @@ static struct dentry *ovl_workdir_create(struct vfsmount *mnt,
struct kstat stat = { struct kstat stat = {
.mode = S_IFDIR | 0, .mode = S_IFDIR | 0,
}; };
struct iattr attr = {
.ia_valid = ATTR_MODE,
.ia_mode = stat.mode,
};
if (work->d_inode) { if (work->d_inode) {
err = -EEXIST; err = -EEXIST;
...@@ -813,6 +817,21 @@ static struct dentry *ovl_workdir_create(struct vfsmount *mnt, ...@@ -813,6 +817,21 @@ static struct dentry *ovl_workdir_create(struct vfsmount *mnt,
err = ovl_create_real(dir, work, &stat, NULL, NULL, true); err = ovl_create_real(dir, work, &stat, NULL, NULL, true);
if (err) if (err)
goto out_dput; goto out_dput;
err = vfs_removexattr(work, XATTR_NAME_POSIX_ACL_DEFAULT);
if (err && err != -ENODATA)
goto out_dput;
err = vfs_removexattr(work, XATTR_NAME_POSIX_ACL_ACCESS);
if (err && err != -ENODATA)
goto out_dput;
/* Clear any inherited mode bits */
inode_lock(work->d_inode);
err = notify_change(work, &attr, NULL);
inode_unlock(work->d_inode);
if (err)
goto out_dput;
} }
out_unlock: out_unlock:
inode_unlock(dir); inode_unlock(dir);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment