This is a note to let you know that I've just added the patch titled
io_uring: ensure '0' is returned on file registration success
to the 5.10-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-ensure-0-is-returned-on-file-registration-success.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From a8c22921a08a8d50b10fc836cff4348d5dde17e2 Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@xxxxxxxxx>
Date: Tue, 2 Apr 2024 08:28:04 -0600
Subject: io_uring: ensure '0' is returned on file registration success
From: Jens Axboe <axboe@xxxxxxxxx>
A previous backport mistakenly removed code that cleared 'ret' to zero,
as the SCM logging was performed. Fix up the return value so we don't
return an errant error on fixed file registration.
Fixes: a6771f343af9 ("io_uring: drop any code related to SCM_RIGHTS")
Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
io_uring/io_uring.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -8247,7 +8247,7 @@ static int io_sqe_files_register(struct
}
io_rsrc_node_switch(ctx, NULL);
- return ret;
+ return 0;
out_fput:
for (i = 0; i < ctx->nr_user_files; i++) {
file = io_file_from_index(ctx, i);
Patches currently in stable-queue which might be from axboe@xxxxxxxxx are
queue-5.10/block-introduce-zone_write_granularity-limit.patch
queue-5.10/block-clear-zone-limits-for-a-non-zoned-stacked-queu.patch
queue-5.10/fs-aio-check-iocb_aio_rw-before-the-struct-aio_kiocb-conversion.patch
queue-5.10/init-open-initrd.image-with-o_largefile.patch
queue-5.10/io_uring-ensure-0-is-returned-on-file-registration-success.patch
