io_uring: fix size calculation when registering buf ring
PATCH 1/1 io_uring: fix size calculation when registering buf ring
Using struct_size() to calculate the size of io_uring_buf_ring will sum the size of the struct and of the bufs array. However, the struct's fields are overlaid with the array making the calculated size larger than it should be.
When registering a ring with N * PAGE_SIZE / sizeof(struct io_uring_buf) entries, i.e. with fully filled pages, the calculated size will span one more page than it should and io_uring will try to pin the following page. Depending on how the application allocated the ring, it might succeed using an unrelated page or fail returning EFAULT.
The size of the ring should be the product of ring_entries and the size of io_uring_buf, i.e. the size of the bufs array only.
---
I'll send a liburing test shortly.
io_uring/kbuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
io_uring/kbuf.c +1 -1
@@ -505,7 +505,7 @@ int io_register_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg) } pages =io_pin_pages (reg.ring_addr, -struct_size (br, bufs, reg.ring_entries), +flex_array_size (br, bufs, reg.ring_entries), &nr_pages);if (IS_ERR (pages)) {kfree (free_bl);
Signature · 1 line
2.30.2
Quoted 11 lines · Wojciech Lukowicz
Using
struct_size()to calculate the size ofio_uring_buf_ringwill sum the size of the struct and of the bufs array. However, the struct's fields are overlaid with the array making the calculated size larger than it should be.When registering a ring with N *
PAGE_SIZE/sizeof(struct io_uring_buf)entries, i.e. with fully filled pages, the calculated size will span one more page than it should andio_uringwill try to pin the following page. Depending on how the application allocated the ring, it might succeed using an unrelated page or fail returning EFAULT.
Quoted 5 lines
The size of the ring should be the product of
ring_entriesand the size ofio_uring_buf, i.e. the size of the bufs array only.Fixes c7fb19428d67 ("io_uring: add support for ring mapped supplied buffers")Signed-off-by Wojciech Lukowicz <[email protected]>
Makes sense to me and tested. Feel free to add
Quoted 19 lines
---
I'll send a liburing test shortly.io_uring/kbuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)io_uring/kbuf.c +1
-1@@ -505,7 +505,7 @@ int io_register_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg) } pages =io_pin_pages (reg.ring_addr, -struct_size (br, bufs, reg.ring_entries), +flex_array_size (br, bufs, reg.ring_entries), &nr_pages);if (IS_ERR (pages)) {kfree (free_bl);
Signature · 1 line
Gabriel Krisman Bertazi
Quoted 5 lines · Wojciech Lukowicz
Using
struct_size()to calculate the size ofio_uring_buf_ringwill sum the size of the struct and of the bufs array. However, the struct's fields are overlaid with the array making the calculated size larger than it should be.
Quoted 7 lines
When registering a ring with N *
PAGE_SIZE/sizeof(struct io_uring_buf)entries, i.e. with fully filled pages, the calculated size will span one more page than it should andio_uringwill try to pin the following page. Depending on how the application allocated the ring, it might succeed using an unrelated page or fail returning EFAULT.[...]
Applied, thanks!
[1/1] io_uring: fix size calculation when registering buf ring
commit: 8318ba8fbd645d269f2e9a590f72f8bad8b5c295
Best regards,
Signature · 1 line
Jens Axboe