Skip to content
Browse files

vfs: Make acl_permission_check() work for richacls

Acked-by: J. Bruce Fields <bfields@redhat.com>
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>
  • Loading branch information...
1 parent e963a4c commit 26dc449ec33f7432bd96ae6529e14b02a29e01bf Andreas Gruenbacher committed with Oct 18, 2011
Showing with 14 additions and 0 deletions.
  1. +14 −0 fs/namei.c
View
14 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 {

0 comments on commit 26dc449

Please sign in to comment.
Something went wrong with that request. Please try again.