[PATCH] pass MAY_OPEN to vfs_permission() explicitly

... and get rid of the last "let's deduce mask from nameidata->flags"
bit.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2008-07-17 09:37:02 -04:00
parent a110343f0d
commit b77b0646ef
7 changed files with 15 additions and 24 deletions
+1 -2
View File
@@ -211,8 +211,7 @@ static int cap_inode_follow_link(struct dentry *dentry,
return 0;
}
static int cap_inode_permission(struct inode *inode, int mask,
struct nameidata *nd)
static int cap_inode_permission(struct inode *inode, int mask)
{
return 0;
}
+2 -2
View File
@@ -429,11 +429,11 @@ int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
return security_ops->inode_follow_link(dentry, nd);
}
int security_inode_permission(struct inode *inode, int mask, struct nameidata *nd)
int security_inode_permission(struct inode *inode, int mask)
{
if (unlikely(IS_PRIVATE(inode)))
return 0;
return security_ops->inode_permission(inode, mask, nd);
return security_ops->inode_permission(inode, mask);
}
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
+2 -3
View File
@@ -2624,12 +2624,11 @@ static int selinux_inode_follow_link(struct dentry *dentry, struct nameidata *na
return dentry_has_perm(current, NULL, dentry, FILE__READ);
}
static int selinux_inode_permission(struct inode *inode, int mask,
struct nameidata *nd)
static int selinux_inode_permission(struct inode *inode, int mask)
{
int rc;
rc = secondary_ops->inode_permission(inode, mask, nd);
rc = secondary_ops->inode_permission(inode, mask);
if (rc)
return rc;
+1 -2
View File
@@ -522,8 +522,7 @@ static int smack_inode_rename(struct inode *old_inode,
*
* Returns 0 if access is permitted, -EACCES otherwise
*/
static int smack_inode_permission(struct inode *inode, int mask,
struct nameidata *nd)
static int smack_inode_permission(struct inode *inode, int mask)
{
/*
* No permission to check. Existence test. Yup, it's there.