aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-01-28 20:10:56 -0500
committerJames Morris <jmorris@namei.org>2009-01-29 16:55:08 -0500
commitf51115b9ab5b9cfd0b7be1cce75afbf3ffbcdd87 (patch)
treebc93812358e9a76c24ca970224fcd8298fe8b80c
parentdd4907a6d4e038dc65839fcd4030ebefe2f5f439 (diff)
selinux: remove secondary ops call to inode_follow_link
Remove secondary ops call to inode_follow_link, which is a noop in capabilities. Acked-by: Serge Hallyn <serue@us.ibm.com> Signed-off-by: James Morris <jmorris@namei.org>
-rw-r--r--security/selinux/hooks.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 03621928f1b2..67291a385c75 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2674,11 +2674,7 @@ static int selinux_inode_readlink(struct dentry *dentry)
2674static int selinux_inode_follow_link(struct dentry *dentry, struct nameidata *nameidata) 2674static int selinux_inode_follow_link(struct dentry *dentry, struct nameidata *nameidata)
2675{ 2675{
2676 const struct cred *cred = current_cred(); 2676 const struct cred *cred = current_cred();
2677 int rc;
2678 2677
2679 rc = secondary_ops->inode_follow_link(dentry, nameidata);
2680 if (rc)
2681 return rc;
2682 return dentry_has_perm(cred, NULL, dentry, FILE__READ); 2678 return dentry_has_perm(cred, NULL, dentry, FILE__READ);
2683} 2679}
2684 2680