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;