[PATCH] io_uring: clean up a type in io_uring_register_get_file()

[PATCH] io_uring: clean up a type in io_uring_register_get_file()

[Dan Carpenter]

Originally "fd" was unsigned int but it was changed to int when we pulled
this code into a separate function in commit 0b6d253e084a
("io_uring/register: provide helper to get io_ring_ctx from 'fd'").  This
doesn't really cause a runtime problem because the call to
array_index_nospec() will clamp negative fds to 0 and nothing else uses
the negative values.

Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
 io_uring/register.c | 2 +-
 io_uring/register.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/io_uring/register.c b/io_uring/register.c
index dab0f8024ddf..165f8661c12b 100644
--- a/io_uring/register.c
+++ b/io_uring/register.c
@@ -561,7 +561,7 @@ static int __io_uring_register(struct io_ring_ctx *ctx, unsigned opcode,
  * true, then the registered index is used. Otherwise, the normal fd table.
  * Caller must call fput() on the returned file, unless it's an ERR_PTR.
  */
-struct file *io_uring_register_get_file(int fd, bool registered)
+struct file *io_uring_register_get_file(unsigned int fd, bool registered)
 {
 	struct file *file;
 
diff --git a/io_uring/register.h b/io_uring/register.h
index cc69b88338fe..a5f39d5ef9e0 100644
--- a/io_uring/register.h
+++ b/io_uring/register.h
@@ -4,6 +4,6 @@
 
 int io_eventfd_unregister(struct io_ring_ctx *ctx);
 int io_unregister_personality(struct io_ring_ctx *ctx, unsigned id);
-struct file *io_uring_register_get_file(int fd, bool registered);
+struct file *io_uring_register_get_file(unsigned int fd, bool registered);
 
 #endif
-- 
2.45.2

Re: [PATCH] io_uring: clean up a type in io_uring_register_get_file()

[Jens Axboe]

On Mon, 16 Sep 2024 17:07:10 +0300, Dan Carpenter wrote:
> Originally "fd" was unsigned int but it was changed to int when we pulled
> this code into a separate function in commit 0b6d253e084a
> ("io_uring/register: provide helper to get io_ring_ctx from 'fd'").  This
> doesn't really cause a runtime problem because the call to
> array_index_nospec() will clamp negative fds to 0 and nothing else uses
> the negative values.
> 
> [...]

Applied, thanks!

[1/1] io_uring: clean up a type in io_uring_register_get_file()
      (no commit info)

Best regards,
-- 
Jens Axboe