summaryrefslogtreecommitdiff
path: root/fs/aufs/i_op.c
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-10-20 00:10:27 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-10-20 00:10:27 -0300
commitd0b2f91bede3bd5e3d24dd6803e56eee959c1797 (patch)
tree7fee4ab0509879c373c4f2cbd5b8a5be5b4041ee /fs/aufs/i_op.c
parente914f8eb445e8f74b00303c19c2ffceaedd16a05 (diff)
Linux-libre 4.8.2-gnupck-4.8.2-gnu
Diffstat (limited to 'fs/aufs/i_op.c')
-rw-r--r--fs/aufs/i_op.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/fs/aufs/i_op.c b/fs/aufs/i_op.c
index 7b515db87..c730ec71f 100644
--- a/fs/aufs/i_op.c
+++ b/fs/aufs/i_op.c
@@ -18,12 +18,15 @@ static int h_permission(struct inode *h_inode, int mask,
int err;
const unsigned char write_mask = !!(mask & (MAY_WRITE | MAY_APPEND));
+ err = -EPERM;
+ if (write_mask && IS_IMMUTABLE(h_inode))
+ goto out;
+
err = -EACCES;
- if ((write_mask && IS_IMMUTABLE(h_inode))
- || ((mask & MAY_EXEC)
- && S_ISREG(h_inode->i_mode)
- && (path_noexec(h_path)
- || !(h_inode->i_mode & S_IXUGO))))
+ if (((mask & MAY_EXEC)
+ && S_ISREG(h_inode->i_mode)
+ && (path_noexec(h_path)
+ || !(h_inode->i_mode & S_IXUGO))))
goto out;
/*