Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1ac9f6b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: default avatarJames Morris <jmorris@namei.org>
Acked-by: default avatarSerge Hallyn <serue@us.ibm.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b7a437b0

fs/namei.c

+1 −7
Original line number Diff line number Diff line
@@ -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;