DigiGoon/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Revert "exec: Fix a deadlock in strace""

Browse source 
This reverts commit 2ca0318f1b which is
commit 3e74fabd39710ee29fa25618d2c2b40cfa7d76c7 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: Ie32b2a8963d380332f7954ce40880a37f2a4473b
This commit is contained in:
Greg Kroah-Hartman 2021-01-11 14:19:37 +01:00
parent 7ce628250f
commit 9ad362fbfb
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kernel/fork.c
View file

@ -1232,7 +1232,7 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
struct mm_struct *mm;
int err;
err = mutex_lock_killable(&task->signal->cred_guard_mutex);
err = mutex_lock_killable(&task->signal->exec_update_mutex);
if (err)
return ERR_PTR(err);
@ -1242,7 +1242,7 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
mmput(mm);
mm = ERR_PTR(-EACCES);
}
mutex_unlock(&task->signal->cred_guard_mutex);
mutex_unlock(&task->signal->exec_update_mutex);
return mm;
}