---

yaml --- r: 157286 b: refs/heads/master c: f1ac9f6 h: refs/heads/master v: v3
git-mirror · Sep 8, 2009 · 1e10f66 · 1e10f66
1 parent dc4c858
commit 1e10f66
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7a437b08a44a3ed7e3a052eb39d2c5f618b603b
+refs/heads/master: f1ac9f6bfea6f21e8ab6dbbe46879d62a6fba8c0
diff --git a/trunk/fs/namei.c b/trunk/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;