From mboxrd@z Thu Jan 1 00:00:00 1970 From: Linus Torvalds Subject: [PATCH 3/8] Simplify exec_permission_lite() further Date: Mon, 7 Sep 2009 14:03:08 -0700 (PDT) Message-ID: References: Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: Eric Paris , Mimi Zohar , James Morris To: Linux Kernel Mailing List , Al Viro , Linux Filesystem Mailing List Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:60615 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752342AbZIGVEI (ORCPT ); Mon, 7 Sep 2009 17:04:08 -0400 In-Reply-To: Sender: linux-fsdevel-owner@vger.kernel.org List-ID: From: Linus Torvalds Date: Fri, 28 Aug 2009 10:53:56 -0700 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. Signed-off-by: Linus Torvalds --- fs/namei.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index bf8aa95..e39e5cb 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; -- 1.6.4.1.209.g74b8