aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-28 10:05:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-08 11:07:17 -0700
commite8e66ed25b5cbeebed69c475f6c108e52078a3b3 (patch)
tree1827efb3f775eb27238ccaf174cac9228f83cebf
parent7c8460db30dfd085ef3837c8fb02ecf2e718b983 (diff)
Do not call 'ima_path_check()' for each path component
Not only is that a supremely timing-critical path, but it's hopefully some day going to be lockless for the common case, and ima can't do that. Plus the integrity code doesn't even care about non-regular files, so it was always a total waste of time and effort. Acked-by: Serge Hallyn <serue@us.ibm.com> Acked-by: Mimi Zohar <zohar@us.ibm.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/namei.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/namei.c b/fs/namei.c
index 1f13751693a..a005d8b7afa 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -856,9 +856,6 @@ static int __link_path_walk(const char *name, struct nameidata *nd)
if (err == -EAGAIN)
err = inode_permission(nd->path.dentry->d_inode,
MAY_EXEC);
- if (!err)
- err = ima_path_check(&nd->path, MAY_EXEC,
- IMA_COUNT_UPDATE);
if (err)
break;