diff options
| author | Jens Axboe <axboe@kernel.dk> | 2025-07-06 16:42:23 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2025-07-06 16:42:23 -0600 |
| commit | 1bc8890264804a6ec393a0a0c1b72ec509f95236 (patch) | |
| tree | f5d57480a47fb5780260451428e8700e4003e74e /io_uring/zcrx.c | |
| parent | cf73d9970ea4f8cace5d8f02d2565a2723003112 (diff) | |
| parent | 6f11adcc6f36ffd8f33dbdf5f5ce073368975bc3 (diff) | |
| download | linux-next-1bc8890264804a6ec393a0a0c1b72ec509f95236.tar.gz linux-next-1bc8890264804a6ec393a0a0c1b72ec509f95236.zip | |
Merge branch 'io_uring-6.16' into for-6.17/io_uring
Merge in 6.16 io_uring fixes, to avoid clashes with pending net and
settings changes.
* io_uring-6.16:
io_uring: gate REQ_F_ISREG on !S_ANON_INODE as well
io_uring/kbuf: flag partial buffer mappings
io_uring/net: mark iov as dynamically allocated even for single segments
io_uring: fix resource leak in io_import_dmabuf()
io_uring: don't assume uaddr alignment in io_vec_fill_bvec
io_uring/rsrc: don't rely on user vaddr alignment
io_uring/rsrc: fix folio unpinning
io_uring: make fallocate be hashed work
Diffstat (limited to 'io_uring/zcrx.c')
| -rw-r--r-- | io_uring/zcrx.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c index 797247a34cb7..085eeed8cd50 100644 --- a/io_uring/zcrx.c +++ b/io_uring/zcrx.c @@ -106,8 +106,10 @@ static int io_import_dmabuf(struct io_zcrx_ifq *ifq, for_each_sgtable_dma_sg(mem->sgt, sg, i) total_size += sg_dma_len(sg); - if (total_size < off + len) - return -EINVAL; + if (total_size < off + len) { + ret = -EINVAL; + goto err; + } mem->dmabuf_offset = off; mem->size = len; |