[PATCH v2 1/1] io_uring/tctx: avoid modifying loop variable in io_ring_add_registered_file

[PATCH v2 1/1] io_uring/tctx: avoid modifying loop variable in io_ring_add_registered_file

[Yang Xiuwei]

Use a separate 'idx' variable to store the result of array_index_nospec()
instead of modifying the loop variable 'offset' directly. This improves
code clarity by separating the logical index from the sanitized index
used for array access.

No functional change intended.

Signed-off-by: Yang Xiuwei <yangxiuwei@kylinos.cn>

---

Changes in v2:
  - Updated commit message to code cleanup instead of bug fix
  - Link to v1: https://lore.kernel.org/all/20260209061919.425074-1-yangxiuwei@kylinos.cn/
  
 io_uring/tctx.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/io_uring/tctx.c b/io_uring/tctx.c
index 6d6f44215ec8..fae99cc63961 100644
--- a/io_uring/tctx.c
+++ b/io_uring/tctx.c
@@ -221,14 +221,14 @@ void io_uring_unreg_ringfd(void)
 int io_ring_add_registered_file(struct io_uring_task *tctx, struct file *file,
 				     int start, int end)
 {
-	int offset;
+	int offset, idx;
 	for (offset = start; offset < end; offset++) {
-		offset = array_index_nospec(offset, IO_RINGFD_REG_MAX);
-		if (tctx->registered_rings[offset])
+		idx = array_index_nospec(offset, IO_RINGFD_REG_MAX);
+		if (tctx->registered_rings[idx])
 			continue;
 
-		tctx->registered_rings[offset] = file;
-		return offset;
+		tctx->registered_rings[idx] = file;
+		return idx;
 	}
 	return -EBUSY;
 }
-- 
2.25.1

Re: [PATCH v2 1/1] io_uring/tctx: avoid modifying loop variable in io_ring_add_registered_file

[Jens Axboe]

On Tue, 10 Feb 2026 10:34:32 +0800, Yang Xiuwei wrote:
> Use a separate 'idx' variable to store the result of array_index_nospec()
> instead of modifying the loop variable 'offset' directly. This improves
> code clarity by separating the logical index from the sanitized index
> used for array access.
> 
> No functional change intended.
> 
> [...]

Applied, thanks!

[1/1] io_uring/tctx: avoid modifying loop variable in io_ring_add_registered_file
      commit: daa0b901f8319414cf9f56237f15240b95e4b1b2

Best regards,
-- 
Jens Axboe