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

This reverts commit 4301db49e5 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 <gregkh@google.com>
Change-Id: Ica7c0c082afa907af0117a5d9c78941fced59ad6
This commit is contained in:
Greg Kroah-Hartman 2020-10-01 20:27:50 +02:00
commit f09b764928

View file

@ -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