From 95c94228db0e04dcbaf319416cc778641c1a9df6 Mon Sep 17 00:00:00 2001 From: James Morris Date: Thu, 29 Jan 2009 12:10:56 +1100 Subject: [PATCH] --- yaml --- r: 132584 b: refs/heads/master c: f51115b9ab5b9cfd0b7be1cce75afbf3ffbcdd87 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/selinux/hooks.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f879171a76be..f7ba7b38898c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd4907a6d4e038dc65839fcd4030ebefe2f5f439 +refs/heads/master: f51115b9ab5b9cfd0b7be1cce75afbf3ffbcdd87 diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c index 03621928f1b2..67291a385c75 100644 --- a/trunk/security/selinux/hooks.c +++ b/trunk/security/selinux/hooks.c @@ -2674,11 +2674,7 @@ static int selinux_inode_readlink(struct dentry *dentry) static int selinux_inode_follow_link(struct dentry *dentry, struct nameidata *nameidata) { const struct cred *cred = current_cred(); - int rc; - rc = secondary_ops->inode_follow_link(dentry, nameidata); - if (rc) - return rc; return dentry_has_perm(cred, NULL, dentry, FILE__READ); }