diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2023-04-13 17:28:12 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-04-15 23:44:57 +0300 |
| commit | 9a57fffedc0ee078418a7793ab29cd3864205340 (patch) | |
| tree | 3aaa0a603842b09ae73d37de96f4cffa914f2831 /io_uring/rsrc.c | |
| parent | 2f2af35f8e5a1ed552ed02e47277d50092a2b9f6 (diff) | |
| download | linux-9a57fffedc0ee078418a7793ab29cd3864205340.tar.xz | |
io_uring/rsrc: clean up __io_sqe_buffers_update()
Inline offset variable, so we don't use it without subjecting it to
array_index_nospec() first.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/77936d9ed23755588810c5eafcea7e1c3b90e3cd.1681395792.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring/rsrc.c')
| -rw-r--r-- | io_uring/rsrc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c index bfa0b382c6c6..38f0c9ce67a7 100644 --- a/io_uring/rsrc.c +++ b/io_uring/rsrc.c @@ -469,7 +469,6 @@ static int __io_sqe_buffers_update(struct io_ring_ctx *ctx, for (done = 0; done < nr_args; done++) { struct io_mapped_ubuf *imu; - int offset = up->offset + done; u64 tag = 0; err = io_copy_iov(ctx, &iov, iovs, done); @@ -490,7 +489,7 @@ static int __io_sqe_buffers_update(struct io_ring_ctx *ctx, if (err) break; - i = array_index_nospec(offset, ctx->nr_user_bufs); + i = array_index_nospec(up->offset + done, ctx->nr_user_bufs); if (ctx->user_bufs[i] != ctx->dummy_ubuf) { err = io_queue_rsrc_removal(ctx->buf_data, i, ctx->rsrc_node, ctx->user_bufs[i]); |