diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-28 17:53:56 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-08 18:07:43 (GMT) |
| commit | f1ac9f6bfea6f21e8ab6dbbe46879d62a6fba8c0 (patch) | |
| tree | 01b4e3c84e1403f6c900dd4412aa09cd335c030c | |
| parent | b7a437b08a44a3ed7e3a052eb39d2c5f618b603b (diff) | |
| download | linux-f1ac9f6bfea6f21e8ab6dbbe46879d62a6fba8c0.tar.xz | |
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>
| -rw-r--r-- | fs/namei.c | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -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; |