From 3a5eaaade4f751806b6642e7fede6c02ea846ebf Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 22 Aug 2006 20:06:03 -0400
Subject: [PATCH] --- yaml --- r: 33551 b: refs/heads/master c:
 9167b0b9a0ab7907191523f5a0528e3b9c288e21 h: refs/heads/master i:   33549:
 3fd0ed8e31254456f3f26b034c1a7f960bc0b6cc   33547:
 547607424939287e14ab61e7a5f102b896582bb5   33543:
 d1e22d795c9a388d96caf1df82368c8c638350c2   33535:
 b175f1d8f1f45ef830bd9b6e610ca78facbc23ac v: v3

---
 [refs]          | 2 +-
 trunk/fs/exec.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 728175b21e0a..c52ef59b65a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a343bb7750e6a098909c34f5c5dfddbc4fa40053
+refs/heads/master: 9167b0b9a0ab7907191523f5a0528e3b9c288e21
diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c
index 8344ba73a2a6..a6f64a98ac50 100644
--- a/trunk/fs/exec.c
+++ b/trunk/fs/exec.c
@@ -922,12 +922,6 @@ int prepare_binprm(struct linux_binprm *bprm)
 	int retval;
 
 	mode = inode->i_mode;
-	/*
-	 * Check execute perms again - if the caller has CAP_DAC_OVERRIDE,
-	 * generic_permission lets a non-executable through
-	 */
-	if (!(mode & 0111))	/* with at least _one_ execute bit set */
-		return -EACCES;
 	if (bprm->file->f_op == NULL)
 		return -EACCES;