From 574eef7397b018f3454eb31543ae39be22929907 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 11 Jan 2021 14:17:40 +0100 Subject: [PATCH] Revert "Revert "proc: io_accounting: Use new infrastructure to fix deadlocks in execve"" This reverts commit 9003db775614734db65eb4cbf3245329d197ec3b which is commit 6914303824bb572278568330d72fc1f8f9814e67 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: I26d2e0a7bf3b760c3c88b56d9126bad318f39a7c --- fs/proc/base.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index f6f56d8ed336..6b046c65ef6a 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -2770,7 +2770,7 @@ static int do_io_accounting(struct task_struct *task, struct seq_file *m, int wh unsigned long flags; int result; - result = mutex_lock_killable(&task->signal->cred_guard_mutex); + result = mutex_lock_killable(&task->signal->exec_update_mutex); if (result) return result; @@ -2806,7 +2806,7 @@ static int do_io_accounting(struct task_struct *task, struct seq_file *m, int wh result = 0; out_unlock: - mutex_unlock(&task->signal->cred_guard_mutex); + mutex_unlock(&task->signal->exec_update_mutex); return result; }