Messages in this thread Patch in this message | | | Date | Mon, 7 Sep 2009 14:03:08 -0700 (PDT) | From | Linus Torvalds <> | Subject | [PATCH 3/8] Simplify exec_permission_lite() further |
| |
From: Linus Torvalds <torvalds@linux-foundation.org> Date: Fri, 28 Aug 2009 10:53:56 -0700
This function is only called for path components that are already known to be directories (they have a '->lookup' method). So don't bother doing that whole S_ISDIR() testing, the whole point of the 'lite()' version is that we know that we are looking at a directory component, and that we're only checking name lookup permission.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> --- fs/namei.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c index bf8aa95..e39e5cb 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -445,13 +445,7 @@ static int exec_permission_lite(struct inode *inode) if (mode & MAY_EXEC) goto ok; - if ((inode->i_mode & S_IXUGO) && capable(CAP_DAC_OVERRIDE)) - goto ok; - - if (S_ISDIR(inode->i_mode) && capable(CAP_DAC_OVERRIDE)) - goto ok; - - if (S_ISDIR(inode->i_mode) && capable(CAP_DAC_READ_SEARCH)) + if (capable(CAP_DAC_OVERRIDE) || capable(CAP_DAC_READ_SEARCH)) goto ok; return -EACCES; -- 1.6.4.1.209.g74b8
| |