diff options
| author | Ari Savolainen | 2011-08-06 18:43:07 +0200 |
|---|---|---|
| committer | Al Viro | 2011-08-07 10:52:23 +0200 |
| commit | 206b1d09a56dcd2db1052245c4131879c410eaf8 (patch) | |
| tree | 86a5d67b10c8736b47323cde7717068e98a023e1 /fs/namei.c | |
| parent | Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd (diff) | |
| download | kernel-qcow2-linux-206b1d09a56dcd2db1052245c4131879c410eaf8.tar.gz kernel-qcow2-linux-206b1d09a56dcd2db1052245c4131879c410eaf8.tar.xz kernel-qcow2-linux-206b1d09a56dcd2db1052245c4131879c410eaf8.zip | |
Fix POSIX ACL permission check
After commit 3567866bf261: "RCUify freeing acls, let check_acl() go ahead in
RCU mode if acl is cached" posix_acl_permission is being called with an
unsupported flag and the permission check fails. This patch fixes the issue.
Signed-off-by: Ari Savolainen <ari.m.savolainen@gmail.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/namei.c')
| -rw-r--r-- | fs/namei.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namei.c b/fs/namei.c index 4a98bf154d88..fc13609a354a 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -186,7 +186,7 @@ static int check_acl(struct inode *inode, int mask) /* no ->get_acl() calls in RCU mode... */ if (acl == ACL_NOT_CACHED) return -ECHILD; - return posix_acl_permission(inode, acl, mask); + return posix_acl_permission(inode, acl, mask & ~MAY_NOT_BLOCK); } acl = get_cached_acl(inode, ACL_TYPE_ACCESS); |