vfs: pass all mask flags check_acl and posix_acl_permission

Acked-by: J. Bruce Fields <[email protected]>
Acked-by: David Howells <[email protected]>
Signed-off-by: Andreas Gruenbacher <[email protected]>
Signed-off-by: Aneesh Kumar K.V <[email protected]>
Signed-off-by: Christoph Hellwig <[email protected]>

diff --git a/fs/namei.c b/fs/namei.c
index 2a4574f48001ba8a5b80641bc8edac19eb18a962..276cd30ab8f89a0111395f8f132228d55abc7b52 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -227,8 +227,6 @@ static int acl_permission_check(struct inode *inode, int mask)
 {
        unsigned int mode = inode->i_mode;
 
-       mask &= MAY_READ | MAY_WRITE | MAY_EXEC | MAY_NOT_BLOCK;
-
        if (current_user_ns() != inode_userns(inode))
                goto other_perms;
 

diff --git a/fs/posix_acl.c b/fs/posix_acl.c
index 10027b42b7e29aefa1b9158ab0ec23de5f00914a..cea4623f1ed63007b8da0a8486ac65595415f895 100644 (file)
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
@@ -218,6 +218,8 @@ posix_acl_permission(struct inode *inode, const struct posix_acl *acl, int want)
        const struct posix_acl_entry *pa, *pe, *mask_obj;
        int found = 0;
 
+       want &= MAY_READ | MAY_WRITE | MAY_EXEC | MAY_NOT_BLOCK;
+
        FOREACH_ACL_ENTRY(pa, acl, pe) {
                 switch(pa->e_tag) {
                         case ACL_USER_OBJ: