projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ocfs2: Add new cluster lock type
[powerpc.git]
/
fs
/
exec.c
diff --git
a/fs/exec.c
b/fs/exec.c
index
c8494f5
..
54135df
100644
(file)
--- a/
fs/exec.c
+++ b/
fs/exec.c
@@
-22,7
+22,6
@@
* formats.
*/
* formats.
*/
-#include <linux/config.h>
#include <linux/slab.h>
#include <linux/file.h>
#include <linux/mman.h>
#include <linux/slab.h>
#include <linux/file.h>
#include <linux/mman.h>
@@
-487,8
+486,6
@@
struct file *open_exec(const char *name)
if (!(nd.mnt->mnt_flags & MNT_NOEXEC) &&
S_ISREG(inode->i_mode)) {
int err = vfs_permission(&nd, MAY_EXEC);
if (!(nd.mnt->mnt_flags & MNT_NOEXEC) &&
S_ISREG(inode->i_mode)) {
int err = vfs_permission(&nd, MAY_EXEC);
- if (!err && !(inode->i_mode & 0111))
- err = -EACCES;
file = ERR_PTR(err);
if (!err) {
file = nameidata_to_filp(&nd, O_RDONLY);
file = ERR_PTR(err);
if (!err) {
file = nameidata_to_filp(&nd, O_RDONLY);
@@
-754,7
+751,7
@@
no_thread_group:
write_lock_irq(&tasklist_lock);
spin_lock(&oldsighand->siglock);
write_lock_irq(&tasklist_lock);
spin_lock(&oldsighand->siglock);
- spin_lock
(&newsighand->siglock
);
+ spin_lock
_nested(&newsighand->siglock, SINGLE_DEPTH_NESTING
);
rcu_assign_pointer(current->sighand, newsighand);
recalc_sigpending();
rcu_assign_pointer(current->sighand, newsighand);
recalc_sigpending();
@@
-923,12
+920,6
@@
int prepare_binprm(struct linux_binprm *bprm)
int retval;
mode = inode->i_mode;
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;
if (bprm->file->f_op == NULL)
return -EACCES;