aboutsummaryrefslogtreecommitdiffstats
path: root/security/selinux/hooks.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-07-17 09:37:02 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2008-07-26 20:53:22 -0400
commitb77b0646ef4efe31a7449bb3d9360fd00f95433d (patch)
treef8487fe832fbe23400c9f98e808555f0251fb158 /security/selinux/hooks.c
parenta110343f0d6d41f68b7cf8c00b57a3172c67f816 (diff)
[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>
Diffstat (limited to 'security/selinux/hooks.c')
-rw-r--r--security/selinux/hooks.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 3481cde5bf15..5ba13908b5b4 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2624,12 +2624,11 @@ static int selinux_inode_follow_link(struct dentry *dentry, struct nameidata *na
2624 return dentry_has_perm(current, NULL, dentry, FILE__READ); 2624 return dentry_has_perm(current, NULL, dentry, FILE__READ);
2625} 2625}
2626 2626
2627static int selinux_inode_permission(struct inode *inode, int mask, 2627static int selinux_inode_permission(struct inode *inode, int mask)
2628 struct nameidata *nd)
2629{ 2628{
2630 int rc; 2629 int rc;
2631 2630
2632 rc = secondary_ops->inode_permission(inode, mask, nd); 2631 rc = secondary_ops->inode_permission(inode, mask);
2633 if (rc) 2632 if (rc)
2634 return rc; 2633 return rc;
2635 2634