openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "ovl: relax permission checking on underlying layers" 

This reverts commit 007ea44892.

The commit broke some selinux-testsuite cases, and it looks like there's no
straightforward fix keeping the direction of this patch, so revert for now.

The original patch was trying to fix the consistency of permission checks, and
not an observed bug.  So reverting should be safe.

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
This commit is contained in:
Miklos Szeredi 2018-12-04 11:31:30 +01:00
parent 155b8a0492
commit ec7ba118b9
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/overlayfs/inode.c
View File

@ -286,22 +286,13 @@ int ovl_permission(struct inode *inode, int mask)
if (err) if (err)
return err; return err;
/* No need to do any access on underlying for special files */ old_cred = ovl_override_creds(inode->i_sb);
if (special_file(realinode->i_mode)) if (!upperinode &&
return 0; !special_file(realinode->i_mode) && mask & MAY_WRITE) {
/* No need to access underlying for execute */
mask &= ~MAY_EXEC;
if ((mask & (MAY_READ | MAY_WRITE)) == 0)
return 0;
/* Lower files get copied up, so turn write access into read */
if (!upperinode && mask & MAY_WRITE) {
mask &= ~(MAY_WRITE | MAY_APPEND); mask &= ~(MAY_WRITE | MAY_APPEND);
/* Make sure mounter can read file for copy up later */
mask |= MAY_READ; mask |= MAY_READ;
} }
old_cred = ovl_override_creds(inode->i_sb);
err = inode_permission(realinode, mask); err = inode_permission(realinode, mask);
revert_creds(old_cred); revert_creds(old_cred);