diff options
| author | Pavel Begunkov <[email protected]> | 2025-07-21 09:56:21 +0000 |
|---|---|---|
| committer | Jens Axboe <[email protected]> | 2025-07-21 12:47:45 +0000 |
| commit | 6bbd3411ff87df1ca38ff32d36eb5dc673ca8021 (patch) | |
| tree | b26c02f4c583039b74f492a1fc7bc8a4266bbd0a | |
| parent | io_uring/zcrx: fix null ifq on area destruction (diff) | |
| download | kernel-6bbd3411ff87df1ca38ff32d36eb5dc673ca8021.tar.gz kernel-6bbd3411ff87df1ca38ff32d36eb5dc673ca8021.zip | |
io_uring/zcrx: don't leak pages on account failure
Someone needs to release pinned pages in io_import_umem() if accounting
fails. Assign them to the area but return an error, the following
io_zcrx_free_area() will clean them up.
Fixes: 262ab205180d2 ("io_uring/zcrx: account area memory")
Signed-off-by: Pavel Begunkov <[email protected]>
Link: https://lore.kernel.org/r/e19f283a912f200c0d427e376cb789fc3f3d69bc.1753091564.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <[email protected]>
| -rw-r--r-- | io_uring/zcrx.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c index 6b4bdefb40c4..6a983f1ab592 100644 --- a/io_uring/zcrx.c +++ b/io_uring/zcrx.c @@ -199,15 +199,13 @@ static int io_import_umem(struct io_zcrx_ifq *ifq, mem->account_pages = io_count_account_pages(pages, nr_pages); ret = io_account_mem(ifq->ctx, mem->account_pages); - if (ret < 0) { + if (ret < 0) mem->account_pages = 0; - return ret; - } mem->pages = pages; mem->nr_folios = nr_pages; mem->size = area_reg->len; - return 0; + return ret; } static void io_release_area_mem(struct io_zcrx_mem *mem) |