Commit eb065d30 authored Nov 20, 2019 by Jens Axboe

io_uring: io_allocate_scq_urings() should return a sane state



We currently rely on the ring destroy on cleaning things up in case of
failure, but io_allocate_scq_urings() can leave things half initialized
if only parts of it fails.

Be nice and return with either everything setup in success, or return an
error with things nicely cleaned up.

Reported-by:  <syzbot+0d818c0d39399188f393@syzkaller.appspotmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent bbad27b2

fs/io_uring.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -4583,12 +4583,18 @@ static int io_allocate_scq_urings(struct io_ring_ctx *ctx,
		ctx->cq_entries = rings->cq_ring_entries;

		size = array_size(sizeof(struct io_uring_sqe), p->sq_entries);
		if (size == SIZE_MAX)
		if (size == SIZE_MAX) {
		io_mem_free(ctx->rings);
		ctx->rings = NULL;
		return -EOVERFLOW;
		}

		ctx->sq_sqes = io_mem_alloc(size);
		if (!ctx->sq_sqes)
		if (!ctx->sq_sqes) {
		io_mem_free(ctx->rings);
		ctx->rings = NULL;
		return -ENOMEM;
		}

		return 0;
		}

Admin message