From f09b76492842e239aacfd011ef4fa2f3d8fd6a4b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 1 Oct 2020 20:27:50 +0200 Subject: [PATCH] Revert "proc: Use new infrastructure to fix deadlocks in execve" This reverts commit 4301db49e5569fbb729769bfaf9b21b858330543 which is commit 2db9dbf71bf98d02a0bf33e798e5bfd2a9944696 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: Ica7c0c082afa907af0117a5d9c78941fced59ad6 --- fs/proc/base.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index f6f56d8ed336..78aeaafa2384 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -404,11 +404,11 @@ print0: static int lock_trace(struct task_struct *task) { - int err = mutex_lock_killable(&task->signal->exec_update_mutex); + int err = mutex_lock_killable(&task->signal->cred_guard_mutex); if (err) return err; if (!ptrace_may_access(task, PTRACE_MODE_ATTACH_FSCREDS)) { - mutex_unlock(&task->signal->exec_update_mutex); + mutex_unlock(&task->signal->cred_guard_mutex); return -EPERM; } return 0; @@ -416,7 +416,7 @@ static int lock_trace(struct task_struct *task) static void unlock_trace(struct task_struct *task) { - mutex_unlock(&task->signal->exec_update_mutex); + mutex_unlock(&task->signal->cred_guard_mutex); } #ifdef CONFIG_STACKTRACE