leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

proc: io_accounting: Use new infrastructure to fix deadlocks in execve

Browse Source 
This changes do_io_accounting to use the new exec_update_mutex
instead of cred_guard_mutex.

This fixes possible deadlocks when the trace is accessing
/proc/$pid/io for instance.

This should be safe, as the credentials are only used for reading.

Signed-off-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
This commit is contained in:
Bernd Edlinger 2020-03-20 21:27:41 +01:00 committed by Eric W. Biederman
parent 2db9dbf71b
commit 76518d3798
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/proc/base.c
View File

@ -2883,7 +2883,7 @@ static int do_io_accounting(struct task_struct *task, struct seq_file *m, int wh
unsigned long flags; unsigned long flags;
int result; int result;
result = mutex_lock_killable(&task->signal->cred_guard_mutex); result = mutex_lock_killable(&task->signal->exec_update_mutex);
if (result) if (result)
return result; return result;
@ -2919,7 +2919,7 @@ static int do_io_accounting(struct task_struct *task, struct seq_file *m, int wh
result = 0; result = 0;
out_unlock: out_unlock:
mutex_unlock(&task->signal->cred_guard_mutex); mutex_unlock(&task->signal->exec_update_mutex);
return result; return result;
} }