From c4e7de8938fd7f0a2e81c730acd775aa67dc3747 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=81ukasz=20Stelmach?= Date: Mon, 24 Jan 2022 14:53:39 +0100 Subject: [PATCH] WIP: fix log->mutex + misc_mtx ab-ba deadlock MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: Ibaab2947638997dca82c0e47146f77ce0f1bee57 Signed-off-by: Łukasz Stelmach --- kernel/logger.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/logger.c b/kernel/logger.c index 8b2cda9..cf5dd8a 100644 --- a/kernel/logger.c +++ b/kernel/logger.c @@ -689,11 +689,12 @@ static ssize_t logger_aio_write(struct kiocb *iocb, const struct iovec *iov, if (writer->owner != current->group_leader) { struct file *nfile; + mutex_unlock(&log->mutex); nfile = make_new_file(file); if (IS_ERR(nfile)) { - mutex_unlock(&log->mutex); return PTR_ERR(nfile); } + mutex_lock(&log->mutex); file = nfile; writer = file->private_data; @@ -874,11 +875,12 @@ static ssize_t logger_write_iter(struct kiocb *iocb, struct iov_iter *from) if (writer->owner != current->group_leader) { struct file *nfile; + mutex_unlock(&log->mutex); nfile = make_new_file(file); if (IS_ERR(nfile)) { - mutex_unlock(&log->mutex); return PTR_ERR(nfile); } + mutex_lock(&log->mutex); file = nfile; writer = file->private_data; -- 2.34.1