From: Linus Torvalds Date: Fri, 28 Aug 2009 17:53:56 +0000 (-0700) Subject: Simplify exec_permission_lite() further X-Git-Tag: v2.6.32-rc1~739^2~5 X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=f1ac9f6bfea6f21e8ab6dbbe46879d62a6fba8c0;hp=b7a437b08a44a3ed7e3a052eb39d2c5f618b603b;p=net-next-2.6.git 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 Acked-by: Serge Hallyn Signed-off-by: Linus Torvalds --- diff --git a/fs/namei.c b/fs/namei.c index 8c3580610ee..929f535fb22 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;