diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-03-27 15:35:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-03-27 15:35:38 -0700 |
| commit | 196ef74abd3abb97a97fcf416ca9d59851fd1d08 (patch) | |
| tree | df902a5462b9577ffe06dcc8b5a3e29648b8740a /io_uring | |
| parent | 7df48e36313029e4c0907b2023905dd7213fd678 (diff) | |
| parent | 5170efd9c344c68a8075dcb8ed38d3f8a60e7ed4 (diff) | |
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
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/fdinfo.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/io_uring/fdinfo.c b/io_uring/fdinfo.c index 80178b69e05a..c2d3e45544bb 100644 --- a/io_uring/fdinfo.c +++ b/io_uring/fdinfo.c @@ -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, " |