Skip to content

Commit f779ac0

Browse files
committed
io_uring/register: use correct location for io_rings_layout
A previous consolidated the ring size etc calculations into io_prepare_config(), but missed updating io_register_resize_rings() correctly to use the calculated values. As a result, it ended up using on-stack uninitialized values, and hence either failed validating the size correctly, or just failed resizing because the sizes were random. This caused failures in the liburing regression tests: [...] Running test resize-rings.t resize=-7 test_basic 3000 failed Test resize-rings.t failed with ret 1 Running test resize-rings.t /dev/sda resize=-7 test_basic 3000 failed Test resize-rings.t failed with ret 1 Running test resize-rings.t /dev/nvme1n1 resize=-7 test_basic 3000 failed Test resize-rings.t failed with ret 1 Running test resize-rings.t /dev/dm-0 resize=-7 test_basic 3000 failed Test resize-rings.t failed with ret 1 because io_create_region() would return -E2BIG because of unintialized reg->size values. Adjust the struct io_rings_layout rl pointer to point to the correct location, and remove the (now dead) __rl on stack struct. Fixes: eb76ff6 ("io_uring: pre-calculate scq layout") Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent f8f115b commit f779ac0

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

io_uring/register.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ static int io_register_resize_rings(struct io_ring_ctx *ctx, void __user *arg)
403403
struct io_ring_ctx_rings o = { }, n = { }, *to_free = NULL;
404404
unsigned i, tail, old_head;
405405
struct io_uring_params *p = &config.p;
406-
struct io_rings_layout __rl, *rl = &__rl;
406+
struct io_rings_layout *rl = &config.layout;
407407
int ret;
408408

409409
memset(&config, 0, sizeof(config));

0 commit comments

Comments
 (0)