diff options
| author | Linus Torvalds | 2009-08-28 19:53:56 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-09-08 20:07:43 +0200 |
| commit | f1ac9f6bfea6f21e8ab6dbbe46879d62a6fba8c0 (patch) | |
| tree | 01b4e3c84e1403f6c900dd4412aa09cd335c030c /fs/namei.c | |
| parent | Simplify exec_permission_lite() logic (diff) | |
| download | kernel-qcow2-linux-f1ac9f6bfea6f21e8ab6dbbe46879d62a6fba8c0.tar.gz kernel-qcow2-linux-f1ac9f6bfea6f21e8ab6dbbe46879d62a6fba8c0.tar.xz kernel-qcow2-linux-f1ac9f6bfea6f21e8ab6dbbe46879d62a6fba8c0.zip | |
Simplify exec_permission_lite() further
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.
Reviewed-by: James Morris <jmorris@namei.org>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/namei.c')
| -rw-r--r-- | fs/namei.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/namei.c b/fs/namei.c index 8c3580610eec..929f535fb225 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; |