public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-10-31 08:44:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cred_guard_mutex: do not return -EINTR to user-space

Browse source 
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>
This commit is contained in:
Oleg Nesterov 2009-07-05 12:08:26 -07:00 • committed by Linus Torvalds
parent 82e3310ace
commit 793285fcaf
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/compat.c
View file

@ -1486,8 +1486,8 @@ int compat_do_execve(char * filename,
if (!bprm) if (!bprm)
goto out_files; goto out_files;
retval = mutex_lock_interruptible(&current->cred_guard_mutex); retval = -ERESTARTNOINTR;
if (retval < 0) if (mutex_lock_interruptible(&current->cred_guard_mutex))
goto out_free; goto out_free;
current->in_execve = 1; current->in_execve = 1;

4
fs/exec.c
View file

@ -1277,8 +1277,8 @@ int do_execve(char * filename,
if (!bprm) if (!bprm)
goto out_files; goto out_files;
retval = mutex_lock_interruptible(&current->cred_guard_mutex); retval = -ERESTARTNOINTR;
if (retval < 0) if (mutex_lock_interruptible(&current->cred_guard_mutex))
goto out_free; goto out_free;
current->in_execve = 1; current->in_execve = 1;

4
kernel/ptrace.c
View file

@ -181,8 +181,8 @@ int ptrace_attach(struct task_struct *task)
* interference; SUID, SGID and LSM creds get determined differently * interference; SUID, SGID and LSM creds get determined differently
* under ptrace. * under ptrace.
*/ */
retval = mutex_lock_interruptible(&task->cred_guard_mutex); retval = -ERESTARTNOINTR;
if (retval < 0) if (mutex_lock_interruptible(&task->cred_guard_mutex))
goto out; goto out;
task_lock(task); task_lock(task);