Commit 4cdd158b authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: use nospec annotation for more indexes 



There are still several places that using pre array_index_nospec()
indexes, fix them up.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/b01ef5ee83f72ed35ad525912370b729f5d145f4.1649336342.git.asml.silence@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 8f0a2480

fs/io_uring.c

+5 −6
Original line number Diff line number Diff line
@@ -9004,7 +9004,7 @@ static int io_close_fixed(struct io_kiocb *req, unsigned int issue_flags) 
	bool needs_lock = issue_flags & IO_URING_F_UNLOCKED;

	struct io_fixed_file *file_slot;

	struct file *file;

	int ret, i;

	int ret;



	io_ring_submit_lock(ctx, needs_lock);

	ret = -ENXIO;
@@ -9017,8 +9017,8 @@ static int io_close_fixed(struct io_kiocb *req, unsigned int issue_flags) 
	if (ret)

		goto out;



	i = array_index_nospec(offset, ctx->nr_user_files);

	file_slot = io_fixed_file_slot(&ctx->file_table, i);

	offset = array_index_nospec(offset, ctx->nr_user_files);

	file_slot = io_fixed_file_slot(&ctx->file_table, offset);

	ret = -EBADF;

	if (!file_slot->file_ptr)

		goto out;
@@ -9074,8 +9074,7 @@ static int __io_sqe_files_update(struct io_ring_ctx *ctx, 


		if (file_slot->file_ptr) {

			file = (struct file *)(file_slot->file_ptr & FFS_MASK);

			err = io_queue_rsrc_removal(data, up->offset + done,

						    ctx->rsrc_node, file);

			err = io_queue_rsrc_removal(data, i, ctx->rsrc_node, file);

			if (err)

				break;

			file_slot->file_ptr = 0;
@@ -9758,7 +9757,7 @@ static int __io_sqe_buffers_update(struct io_ring_ctx *ctx, 


		i = array_index_nospec(offset, ctx->nr_user_bufs);

		if (ctx->user_bufs[i] != ctx->dummy_ubuf) {

			err = io_queue_rsrc_removal(ctx->buf_data, offset,

			err = io_queue_rsrc_removal(ctx->buf_data, i,

						    ctx->rsrc_node, ctx->user_bufs[i]);

			if (unlikely(err)) {

				io_buffer_unmap(ctx, &imu);