Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

vfs: pass all mask flags check_acl and posix_acl_permission

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>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Andreas Gruenbacher 13 years ago
parent
8522ca5818
commit
d124b60a83
2 changed files with 2 additions and 2 deletions
Unified View Show Diff Stats
  1. 0 2
      fs/namei.c
  2. 2 0
      fs/posix_acl.c

+ 0 - 2
fs/namei.c
View File 

@@ -227,8 +227,6 @@ static int acl_permission_check(struct inode *inode, int mask)
 
 {
 
 {
 
 	unsigned int mode = inode->i_mode;
 
 	unsigned int mode = inode->i_mode;
 
 
 
-	mask &= MAY_READ | MAY_WRITE | MAY_EXEC | MAY_NOT_BLOCK;
 
-
 
 	if (current_user_ns() != inode_userns(inode))
 
 	if (current_user_ns() != inode_userns(inode))
 
 		goto other_perms;
 
 		goto other_perms;

+ 2 - 0
fs/posix_acl.c
View File 

@@ -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;
 
 	const struct posix_acl_entry *pa, *pe, *mask_obj;
 
 	int found = 0;
 
 	int found = 0;
 
 
 
+	want &= MAY_READ | MAY_WRITE | MAY_EXEC | MAY_NOT_BLOCK;
 
+
 
 	FOREACH_ACL_ENTRY(pa, acl, pe) {
 
 	FOREACH_ACL_ENTRY(pa, acl, pe) {
 
                 switch(pa->e_tag) {
 
                 switch(pa->e_tag) {
 
                         case ACL_USER_OBJ:
 
                         case ACL_USER_OBJ: