summaryrefslogtreecommitdiff
path: root/security/selinux
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-01-29 12:14:03 +1100
committerJames Morris <jmorris@namei.org>2009-01-30 08:55:09 +1100
commit188fbcca9dd02f15dcf45cfc51ce0dd6c13993f6 (patch)
tree92523a4606e5ac1e29d61286c4f1f3851eec5553 /security/selinux
parentf51115b9ab5b9cfd0b7be1cce75afbf3ffbcdd87 (diff)
downloadlinux-3.10-188fbcca9dd02f15dcf45cfc51ce0dd6c13993f6.tar.gz
linux-3.10-188fbcca9dd02f15dcf45cfc51ce0dd6c13993f6.tar.bz2
linux-3.10-188fbcca9dd02f15dcf45cfc51ce0dd6c13993f6.zip
selinux: remove secondary ops call to inode_permission
Remove secondary ops call to inode_permission, which is a noop in capabilities. Acked-by: Serge Hallyn <serue@us.ibm.com> Acked-by: Eric Paris <eparis@redhat.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/selinux')
-rw-r--r--security/selinux/hooks.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 67291a385c7..7e90c9e5865 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2681,11 +2681,6 @@ static int selinux_inode_follow_link(struct dentry *dentry, struct nameidata *na
static int selinux_inode_permission(struct inode *inode, int mask)
{
const struct cred *cred = current_cred();
- int rc;
-
- rc = secondary_ops->inode_permission(inode, mask);
- if (rc)
- return rc;
if (!mask) {
/* No permission to check. Existence test. */