diff options
| author | Al Viro | 2011-06-21 01:06:22 +0200 |
|---|---|---|
| committer | Al Viro | 2011-07-20 07:43:19 +0200 |
| commit | 9c2c703929e4c41210cfa6e3f599514421bab8dc (patch) | |
| tree | 2086738f22755ad18ba18ab2ee0f2b23d651da60 /fs/namei.c | |
| parent | ->permission() sanitizing: MAY_NOT_BLOCK (diff) | |
| download | kernel-qcow2-linux-9c2c703929e4c41210cfa6e3f599514421bab8dc.tar.gz kernel-qcow2-linux-9c2c703929e4c41210cfa6e3f599514421bab8dc.tar.xz kernel-qcow2-linux-9c2c703929e4c41210cfa6e3f599514421bab8dc.zip | |
->permission() sanitizing: pass MAY_NOT_BLOCK to ->check_acl()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/namei.c')
| -rw-r--r-- | fs/namei.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/namei.c b/fs/namei.c index 723a3fe4bc40..e0624e2f0bba 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -181,7 +181,7 @@ static int acl_permission_check(struct inode *inode, int mask, unsigned int flag int (*check_acl)(struct inode *inode, int mask, unsigned int flags); unsigned int mode = inode->i_mode; - mask &= MAY_READ | MAY_WRITE | MAY_EXEC; + mask &= MAY_READ | MAY_WRITE | MAY_EXEC | MAY_NOT_BLOCK; if (current_user_ns() != inode_userns(inode)) goto other_perms; @@ -204,7 +204,7 @@ other_perms: /* * If the DACs are ok we don't need any capability check. */ - if ((mask & ~mode) == 0) + if ((mask & ~mode & (MAY_READ | MAY_WRITE | MAY_EXEC)) == 0) return 0; return -EACCES; } |