| | From | "Aneesh Kumar K.V" <> | | Subject | [PATCH -V7 12/26] vfs: Make acl_permission_check() work for richacls | | Date | Tue, 18 Oct 2011 21:02:47 +0530 |
| |
From: Andreas Gruenbacher <agruen@kernel.org>
Acked-by: David Howells <dhowells@redhat.com> Signed-off-by: Andreas Gruenbacher <agruen@kernel.org> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> --- fs/namei.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index eb8f918..0c28f95 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -230,6 +230,20 @@ static int acl_permission_check(struct inode *inode, int mask) if (current_user_ns() != inode_userns(inode)) goto other_perms; + if (IS_RICHACL(inode)) { + int error = check_acl(inode, mask); + if (error != -EAGAIN) + return error; + if (mask & (MAY_DELETE_SELF | MAY_TAKE_OWNERSHIP | + MAY_CHMOD | MAY_SET_TIMES)) { + /* + * The file permission bit cannot grant these + * permissions. + */ + return -EACCES; + } + } + if (likely(current_fsuid() == inode->i_uid)) mode >>= 6; else { -- 1.7.5.4
|