A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 06:09:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
This reverts commit 9003db7756 which is
commit 6914303824bb572278568330d72fc1f8f9814e67 upstream.  We want it
back for a bit to help with merges only.  It will be dropped again
afterward...

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I26d2e0a7bf3b760c3c88b56d9126bad318f39a7c
This commit is contained in:
Greg Kroah-Hartman 2021-01-11 14:17:40 +01:00
commit 574eef7397
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fs/proc/base.c
View file

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