From 2ca0318f1b788e9741d4e9505d63de80d085aa14 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 1 Oct 2020 18:28:47 +0200 Subject: [PATCH] Revert "exec: Fix a deadlock in strace" This reverts commit d8d15a4c445a5d0d13d76729b4ee7639a1deeaa9 which is commit 3e74fabd39710ee29fa25618d2c2b40cfa7d76c7 upstream. It breaks the API and we don't need it right now in the 5.4 tree. Bug: 161946584 Signed-off-by: Greg Kroah-Hartman Change-Id: Ieff15911457c15fcaa7b063139ae887726720089 --- kernel/fork.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/fork.c b/kernel/fork.c index 6b6048b7be81..56d1d00c650e 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -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->exec_update_mutex); + err = mutex_lock_killable(&task->signal->cred_guard_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->exec_update_mutex); + mutex_unlock(&task->signal->cred_guard_mutex); return mm; }