From cdc9e06d57f91d131ec02171cdf434e342ef8fa6 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 1 Oct 2020 20:25:35 +0200 Subject: [PATCH] Revert "proc: io_accounting: Use new infrastructure to fix deadlocks in execve" This reverts commit ba7eb0e48e765a3325e651ed362b27980d8a3c3d which is commit 6914303824bb572278568330d72fc1f8f9814e67 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: Ia97edb0210699760a68bb72af80b494c34d60e62 --- 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 6b046c65ef6a..f6f56d8ed336 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->exec_update_mutex); + result = mutex_lock_killable(&task->signal->cred_guard_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->exec_update_mutex); + mutex_unlock(&task->signal->cred_guard_mutex); return result; }