Unverified Commit a54a2bda authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10468 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/WT6VTXCFPVQZBRI4R3JJWTHU7M623RPW/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAGEK8 
 
Link:https://gitee.com/openeuler/kernel/pulls/10468

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents b895ecb9 bca1a8ac

io_uring/io_uring.c

+4 −0
Original line number Diff line number Diff line
@@ -10403,8 +10403,10 @@ static 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)))
@@ -10429,8 +10431,10 @@ static 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;

}