From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 2 Apr 2024 14:28:04 +0000 (-0600)
Subject: io_uring: ensure '0' is returned on file registration success
X-Git-Tag: v5.10.215~92
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1eff09acc808d3a4225acc754ee8df435407e6a6;p=thirdparty%2Fkernel%2Fstable.git

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 fc60396c90396..93f9ecedc59f6 100644
--- 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);