From 9ad362fbfb43f4403f2674f08d3292830d532016 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 11 Jan 2021 14:19:37 +0100 Subject: [PATCH] Revert "Revert "exec: Fix a deadlock in strace"" This reverts commit 2ca0318f1b788e9741d4e9505d63de80d085aa14 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 Change-Id: Ie32b2a8963d380332f7954ce40880a37f2a4473b --- kernel/fork.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/fork.c b/kernel/fork.c index 4c232ef67740..ead6e4262796 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->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; }