leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ceph: properly apply umask when ACL is enabled

Browse Source 
when ACL is enabled, posix_acl_create() may change inode's mode

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
This commit is contained in:
Yan, Zheng 2014-07-04 13:59:43 +08:00 committed by Ilya Dryomov
parent 5aaa432ad9
commit f5f1864743
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/ceph/acl.c
View File

@ -172,14 +172,24 @@ out:
int ceph_init_acl(struct dentry *dentry, struct inode *inode, struct inode *dir)
{
struct posix_acl *default_acl, *acl;
umode_t new_mode = inode->i_mode;
int error;
error = posix_acl_create(dir, &inode->i_mode, &default_acl, &acl);
error = posix_acl_create(dir, &new_mode, &default_acl, &acl);
if (error)
return error;
if (!default_acl && !acl)
if (!default_acl && !acl) {
cache_no_acl(inode);
if (new_mode != inode->i_mode) {
struct iattr newattrs = {
.ia_mode = new_mode,
.ia_valid = ATTR_MODE,
};
error = ceph_setattr(dentry, &newattrs);
}
return error;
}
if (default_acl) {
error = ceph_set_acl(inode, default_acl, ACL_TYPE_DEFAULT);