Unverified Commit 44ea9363 authored Aug 01, 2024 by openeuler-ci-bot Committed by Gitee Aug 01, 2024

!10463 io_uring: fix possible deadlock in io_register_iowq_max_workers()

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Zhaolong <wangzhaolong1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2XAL7DCC5EU6JXQKUDX5IF7VPESPZNWJ/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAGEK8 
 
Link:https://gitee.com/openeuler/kernel/pulls/10463

 

Reviewed-by: Zhang Peng <zhangpeng362@huawei.com>
Signed-off-by: Zhang Peng <zhangpeng362@huawei.com>

parents bba17dcf ec31c3a8

io_uring/io_uring.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -4340,8 +4340,10 @@ static __cold int io_register_iowq_max_workers(struct io_ring_ctx *ctx,
		}

		if (sqd) {
		mutex_unlock(&ctx->uring_lock);
		mutex_unlock(&sqd->lock);
		io_put_sq_data(sqd);
		mutex_lock(&ctx->uring_lock);
		}

		if (copy_to_user(arg, new_count, sizeof(new_count)))
		@@ -4366,8 +4368,10 @@ static __cold int io_register_iowq_max_workers(struct io_ring_ctx *ctx,
		return 0;
		err:
		if (sqd) {
		mutex_unlock(&ctx->uring_lock);
		mutex_unlock(&sqd->lock);
		io_put_sq_data(sqd);
		mutex_lock(&ctx->uring_lock);
		}
		return ret;
		}