git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exec: do not sleep in TASK_TRACED under ->cred_guard_mutex
[pandora-kernel.git]
/
fs
/
compat.c
diff --git
a/fs/compat.c
b/fs/compat.c
index
94502da
..
6d6f98f
100644
(file)
--- a/
fs/compat.c
+++ b/
fs/compat.c
@@
-1485,20
+1485,15
@@
int compat_do_execve(char * filename,
if (!bprm)
goto out_files;
if (!bprm)
goto out_files;
- retval =
-ERESTARTNOINTR
;
- if (
mutex_lock_interruptible(¤t->cred_guard_mutex)
)
+ retval =
prepare_bprm_creds(bprm)
;
+ if (
retval
)
goto out_free;
goto out_free;
- current->in_execve = 1;
-
- retval = -ENOMEM;
- bprm->cred = prepare_exec_creds();
- if (!bprm->cred)
- goto out_unlock;
retval = check_unsafe_exec(bprm);
if (retval < 0)
retval = check_unsafe_exec(bprm);
if (retval < 0)
- goto out_
unlock
;
+ goto out_
free
;
clear_in_exec = retval;
clear_in_exec = retval;
+ current->in_execve = 1;
file = open_exec(filename);
retval = PTR_ERR(file);
file = open_exec(filename);
retval = PTR_ERR(file);
@@
-1547,7
+1542,6
@@
int compat_do_execve(char * filename,
/* execve succeeded */
current->fs->in_exec = 0;
current->in_execve = 0;
/* execve succeeded */
current->fs->in_exec = 0;
current->in_execve = 0;
- mutex_unlock(¤t->cred_guard_mutex);
acct_update_integrals(current);
free_bprm(bprm);
if (displaced)
acct_update_integrals(current);
free_bprm(bprm);
if (displaced)
@@
-1567,10
+1561,7
@@
out_file:
out_unmark:
if (clear_in_exec)
current->fs->in_exec = 0;
out_unmark:
if (clear_in_exec)
current->fs->in_exec = 0;
-
-out_unlock:
current->in_execve = 0;
current->in_execve = 0;
- mutex_unlock(¤t->cred_guard_mutex);
out_free:
free_bprm(bprm);
out_free:
free_bprm(bprm);