io_uring: ensure '0' is returned on file registration success

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@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index fc60396c9039616d85fe6ec5786f377cfa930daa..93f9ecedc59f62d1bc03d387d9779dc3be71166f 100644 (file)
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -8247,7 +8247,7 @@ static int io_sqe_files_register(struct io_ring_ctx *ctx, void __user *arg,
        }
 
        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);