io_uring/kbuf: fix memory leak if io_buffer_add_list fails
Jens Axboe
maintainerPATCH 1/1 io_uring/kbuf: fix memory leak if io_buffer_add_list fails
io_register_pbuf_ring() ignores the return value of io_buffer_add_list(), which can fail if xa_store() returns an error (e.g., -ENOMEM). When this happens, the function returns 0 (success) to the caller, but the io_buffer_list structure is neither added to the xarray nor freed.
In practice this requires failure injection to hit, hence not a real issue. But it should get fixed up none the less.
---
io_uring/kbuf.c +3 -2
@@ -669,8 +669,9 @@ int io_register_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg) bl->buf_ring = br;if (reg.flags &IOU_PBUF_RING_INC ) bl->flags |=IOBL_INC ; -io_buffer_add_list (ctx, bl, reg.bgid); -return 0 ; + ret =io_buffer_add_list (ctx, bl, reg.bgid); +if (!ret) +return 0 ; fail:io_free_region (ctx->user, &bl->region);kfree (bl);
Signature · 1 line
Jens Axboe
Quoted 9 lines · Jens Axboe
io_register_pbuf_ring()ignores the return value ofio_buffer_add_list(), which can fail ifxa_store()returns an error (e.g.,-ENOMEM). When this happens, the function returns 0 (success) to the caller, but theio_buffer_liststructure is neither added to the xarray nor freed.In practice this requires failure injection to hit, hence not a real issue. But it should get fixed up none the less.
Fixes ef62de3c4ad5 ("io_uring/kbuf: use region api for pbuf rings")
Looks like that patch just moved the call, and the tag should be more like:
c7fb19428d67d ("io_uring: add support for ring mapped supplied buffers")
Quoted 21 lines
Signed-off-by Jens Axboe <[email protected]>---
io_uring/kbuf.c +3
-2@@ -669,8 +669,9 @@ int io_register_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg) bl->buf_ring = br;if (reg.flags &IOU_PBUF_RING_INC ) bl->flags |=IOBL_INC ; -io_buffer_add_list (ctx, bl, reg.bgid); -return 0 ; + ret =io_buffer_add_list (ctx, bl, reg.bgid); +if (!ret) +return 0 ; fail:io_free_region (ctx->user, &bl->region);kfree (bl);
Signature · 1 line
Pavel Begunkov
Jens Axboe
maintainerQuoted 9 lines · Pavel Begunkov
Quoted 8 lines · Jens Axboe
io_register_pbuf_ring()ignores the return value ofio_buffer_add_list(), which can fail ifxa_store()returns an error (e.g.,-ENOMEM). When this happens, the function returns 0 (success) to the caller, but theio_buffer_liststructure is neither added to the xarray nor freed.In practice this requires failure injection to hit, hence not a real issue. But it should get fixed up none the less.
Quoted 6 lines
Quoted 1 line
Fixes ef62de3c4ad5 ("io_uring/kbuf: use region api for pbuf rings")Looks like that patch just moved the call, and the tag should be more like:
c7fb19428d67d("io_uring: add support for ring mapped supplied buffers")
Yep agree, I'll update the tag.
Signature · 1 line
Jens Axboe