summaryrefslogtreecommitdiffstats
path: root/fs/exec.c
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2009-07-05 12:08:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-06 13:57:04 -0700
commit793285fcafce4719a05e0c99fa74b188157fe7fe (patch)
tree3395530c1d4e604beac506c703b3093bb13f23ee /fs/exec.c
parent82e3310ace59794ecf0f531eca94647b2863dfda (diff)
downloadlinux-stable-793285fcafce4719a05e0c99fa74b188157fe7fe.tar.gz
linux-stable-793285fcafce4719a05e0c99fa74b188157fe7fe.tar.bz2
linux-stable-793285fcafce4719a05e0c99fa74b188157fe7fe.zip
cred_guard_mutex: do not return -EINTR to user-space
do_execve() and ptrace_attach() return -EINTR if mutex_lock_interruptible(->cred_guard_mutex) fails. This is not right, change the code to return ERESTARTNOINTR. Perhaps we should also change proc_pid_attr_write(). Signed-off-by: Oleg Nesterov <oleg@redhat.com> Cc: David Howells <dhowells@redhat.com> Acked-by: Roland McGrath <roland@redhat.com> Cc: James Morris <jmorris@namei.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/exec.c')
-rw-r--r--fs/exec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/exec.c b/fs/exec.c
index e639957d7a57..4a8849e45b21 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1277,8 +1277,8 @@ int do_execve(char * filename,
if (!bprm)
goto out_files;
- retval = mutex_lock_interruptible(&current->cred_guard_mutex);
- if (retval < 0)
+ retval = -ERESTARTNOINTR;
+ if (mutex_lock_interruptible(&current->cred_guard_mutex))
goto out_free;
current->in_execve = 1;