diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-06-05 13:52:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-06-05 13:52:15 -0700 |
| commit | c10130c234c81f4a7a143edbf413080235f8d8ce (patch) | |
| tree | 2df9e75d904b69f481646c6a99cadbbdbe72101f /io_uring | |
| parent | 06121e12c27aef6e1a09b4cdec809b9c91f6eb59 (diff) | |
| parent | ed46f39c47eb5530a9c161481a2080d3a869cfaf (diff) | |
| download | linux-next-c10130c234c81f4a7a143edbf413080235f8d8ce.tar.gz linux-next-c10130c234c81f4a7a143edbf413080235f8d8ce.zip | |
Merge tag 'io_uring-7.1-20260605' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux
Pull io_uring fix from Jens Axboe:
"A single fix for a missing flag mask when multishot is used with
an incrementally consumed buffer ring, potentially leading to
application confusion because of lack of IORING_CQE_F_BUF_MORE
consistency"
* tag 'io_uring-7.1-20260605' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux:
io_uring/net: inherit IORING_CQE_F_BUF_MORE across bundle recv retries
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/net.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/io_uring/net.c b/io_uring/net.c index 8df15b639358..ee848eb65ec9 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -842,7 +842,8 @@ int io_recvmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) } /* bits to clear in old and inherit in new cflags on bundle retry */ -#define CQE_F_MASK (IORING_CQE_F_SOCK_NONEMPTY|IORING_CQE_F_MORE) +#define CQE_F_MASK (IORING_CQE_F_SOCK_NONEMPTY|IORING_CQE_F_MORE|\ + IORING_CQE_F_BUF_MORE) /* * Finishes io_recv and io_recvmsg. |