This is a note to let you know that I've just added the patch titled
io_uring/msg_ring: check file type before putting
to the 5.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
io_uring-msg_ring-check-file-type-before-putting.patch
and it can be found in the queue-5.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From fc7222c3a9f56271fba02aabbfbae999042f1679 Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@xxxxxxxxx>
Date: Thu, 15 Sep 2022 11:44:35 -0600
Subject: io_uring/msg_ring: check file type before putting
From: Jens Axboe <axboe@xxxxxxxxx>
commit fc7222c3a9f56271fba02aabbfbae999042f1679 upstream.
If we're invoked with a fixed file, follow the normal rules of not
calling io_fput_file(). Fixed files are permanently registered to the
ring, and do not need putting separately.
Cc: stable@xxxxxxxxxxxxxxx
Fixes: aa184e8671f0 ("io_uring: don't attempt to IOPOLL for MSG_RING requests")
Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
io_uring/io_uring.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -5061,7 +5061,8 @@ done:
req_set_fail(req);
__io_req_complete(req, issue_flags, ret, 0);
/* put file to avoid an attempt to IOPOLL the req */
- io_put_file(req->file);
+ if (!(req->flags & REQ_F_FIXED_FILE))
+ io_put_file(req->file);
req->file = NULL;
return 0;
}
Patches currently in stable-queue which might be from axboe@xxxxxxxxx are
queue-5.19/blk-lib-fix-blkdev_issue_secure_erase.patch
queue-5.19/io_uring-msg_ring-check-file-type-before-putting.patch
queue-5.19/block-blk_queue_enter-__bio_queue_enter-must-return-.patch
