Commit 196ef74a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'io_uring-7.0-20260327' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux 

Pull io_uring fixes from Jens Axboe:
 "Just two small fixes, both fixing regressions added in the fdinfo code
  in 6.19 with the SQE mixed size support"

* tag 'io_uring-7.0-20260327' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux:
  io_uring/fdinfo: fix OOB read in SQE_MIXED wrap check
  io_uring/fdinfo: fix SQE_MIXED SQE displaying
parents 7df48e36 5170efd9

io_uring/fdinfo.c

+3 −1
Original line number Diff line number Diff line
@@ -119,12 +119,14 @@ static void __io_uring_show_fdinfo(struct io_ring_ctx *ctx, struct seq_file *m) 
					sq_idx);

				break;

			}

			if ((++sq_head & sq_mask) == 0) {

			if (sq_idx == sq_mask) {

				seq_printf(m,

					"%5u: corrupted sqe, wrapping 128B entry\n",

					sq_idx);

				break;

			}

			sq_head++;

			i++;

			sqe128 = true;

		}

		seq_printf(m, "%5u: opcode:%s, fd:%d, flags:%x, off:%llu, "