io_uring: io_allocate_scq_urings() should return a sane state

PATCH New Jens Axboe 1 participant 1 message Nov 20, 2019

Subsystems (2)

VFS io_uring

lore

Share & tools

lore

Jens Axboe

author maintainer

2019-11-20 16:28 UTC #0 lore raw

PATCH 1/1 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 [email protected]

Signed-off-by Jens Axboe <[email protected]>

---

fs/io_uring.c +8 -2

index 100931b40301..066b59ffb54e 100644
@@ -4568,12 +4568,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;
 }

Signature · 1 line

Jens Axboe