mirror of
https://github.com/adulau/aha.git
synced 2024-12-27 19:26:25 +00:00
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>
This commit is contained in:
parent
b7a437b08a
commit
f1ac9f6bfe
1 changed files with 1 additions and 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;
|
||||
|
|
Loading…
Reference in a new issue