diff mbox series

io_uring: initialize io_buffer_list head when shared ring is unregistered

Message ID 6d49f50d-52ca-a12e-8f7e-99db5b97ff9f@kernel.dk (mailing list archive)
State New
Headers show
Series io_uring: initialize io_buffer_list head when shared ring is unregistered | expand

Commit Message

Jens Axboe May 18, 2022, 8:38 p.m. UTC
We use ->buf_pages != 0 to tell if this is a shared buffer ring or a
classic provided buffer group. If we unregister the shared ring and
then attempt to use it, buf_pages is zero yet the classic list head
isn't properly initialized. This causes io_buffer_select() to think
that we have classic buffers available, but then we crash when we try
and get one from the list.

Just initialize the list if we unregister a shared buffer ring, leaving
it in a sane state for either re-registration or for attempting to use
it.

Fixes: c7fb19428d67 ("io_uring: add support for ring mapped supplied buffers")
Signed-off-by: Jens Axboe <axboe@kernel.dk>

---
diff mbox series

Patch

diff --git a/fs/io_uring.c b/fs/io_uring.c
index a210a2c0429d..23d68f8dfc66 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -12200,6 +12200,9 @@  static int io_unregister_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg)
 	if (bl->bgid >= BGID_ARRAY) {
 		xa_erase(&ctx->io_bl_xa, bl->bgid);
 		kfree(bl);
+	} else {
+		/* make sure it's seen as empty */
+		INIT_LIST_HEAD(&bl->buf_list);
 	}
 	return 0;
 }