Commit d8f1b971 authored by Xiaoguang Wang's avatar Xiaoguang Wang Committed by Jens Axboe
Browse files

io_uring: fix mismatched finish_wait() calls in io_uring_cancel_files() 



The prepare_to_wait() and finish_wait() calls in io_uring_cancel_files()
are mismatched. Currently I don't see any issues related this bug, just
find it by learning codes.

Signed-off-by: default avatarXiaoguang Wang <xiaoguang.wang@linux.alibaba.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 0e698dfa

fs/io_uring.c

+4 −5
Original line number Diff line number Diff line
@@ -7360,11 +7360,9 @@ static int io_uring_release(struct inode *inode, struct file *file) 
static void io_uring_cancel_files(struct io_ring_ctx *ctx,

				  struct files_struct *files)

{

	struct io_kiocb *req;

	DEFINE_WAIT(wait);



	while (!list_empty_careful(&ctx->inflight_list)) {

		struct io_kiocb *cancel_req = NULL;

		struct io_kiocb *cancel_req = NULL, *req;

		DEFINE_WAIT(wait);



		spin_lock_irq(&ctx->inflight_lock);

		list_for_each_entry(req, &ctx->inflight_list, inflight_entry) {
@@ -7404,6 +7402,7 @@ static void io_uring_cancel_files(struct io_ring_ctx *ctx, 
			 */

			if (refcount_sub_and_test(2, &cancel_req->refs)) {

				io_put_req(cancel_req);

				finish_wait(&ctx->inflight_wait, &wait);

				continue;

			}

		}
@@ -7411,9 +7410,9 @@ static void io_uring_cancel_files(struct io_ring_ctx *ctx, 
		io_wq_cancel_work(ctx->io_wq, &cancel_req->work);

		io_put_req(cancel_req);

		schedule();

	}

		finish_wait(&ctx->inflight_wait, &wait);

	}

}



static int io_uring_flush(struct file *file, void *data)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE