Skip to content

Commit

Permalink
io_uring/kbuf: Fix check of BID wrapping in provided buffers
Browse files Browse the repository at this point in the history
Commit 3851d25 ("io_uring: check for rollover of buffer ID when
providing buffers") introduced a check to prevent wrapping the BID
counter when sqe->off is provided, but it's off-by-one too
restrictive, rejecting the last possible BID (65534).

i.e., the following fails with -EINVAL.

     io_uring_prep_provide_buffers(sqe, addr, size, 0xFFFF, 0, 0);

Fixes: 3851d25 ("io_uring: check for rollover of buffer ID when providing buffers")
Signed-off-by: Gabriel Krisman Bertazi <krisman@suse.de>
Link: https://lore.kernel.org/r/20231005000531.30800-2-krisman@suse.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Gabriel Krisman Bertazi authored and Jens Axboe committed Oct 5, 2023
1 parent 922a2c7 commit ab69838
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion io_uring/kbuf.c
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ int io_provide_buffers_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe
tmp = READ_ONCE(sqe->off);
if (tmp > USHRT_MAX)
return -E2BIG;
if (tmp + p->nbufs >= USHRT_MAX)
if (tmp + p->nbufs > USHRT_MAX)
return -EINVAL;
p->bid = tmp;
return 0;
Expand Down

0 comments on commit ab69838

Please sign in to comment.