Skip to contentSkip to conversation

io_uring: Fix use of uninitialized ret in io_eventfd_register()

PATCH Applied Nathan Chancellor 4 participants 6 messages Feb 7, 2022 – Feb 8, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 io_uring: Fix use of uninitialized ret in io_eventfd_register()

Clang warns:

fs/io_uring.c:9396:9: warning: variable 'ret' is uninitialized when used here [-Wuninitialized]

          return ret;
                 ^~~
  fs/io_uring.c:9373:13: note: initialize the variable 'ret' to silence this warning
          int fd, ret;
                     ^
                      = 0

1 warning generated.

Just return 0 directly and reduce the scope of ret to the if statement, as that is the only place that it is used, which is how the function was before the fixes commit.

Fixes 1a75fac9a0f9 ("io_uring: avoid ring quiesce while registering/unregistering eventfd")
---
 fs/io_uring.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
fs/io_uring.c +3 -3
index 5479f0607430..7ef04bb66da1 100644
@@ -9370,7 +9370,7 @@ static int io_eventfd_register(struct io_ring_ctx *ctx, void __user *arg,
 {
 	struct io_ev_fd *ev_fd;
 	__s32 __user *fds = arg;
-	int fd, ret;
+	int fd;
 
 	ev_fd = rcu_dereference_protected(ctx->io_ev_fd,
 					lockdep_is_held(&ctx->uring_lock));
@@ -9386,14 +9386,14 @@ static int io_eventfd_register(struct io_ring_ctx *ctx, void __user *arg,
 
 	ev_fd->cq_ev_fd = eventfd_ctx_fdget(fd);
 	if (IS_ERR(ev_fd->cq_ev_fd)) {
-		ret = PTR_ERR(ev_fd->cq_ev_fd);
+		int ret = PTR_ERR(ev_fd->cq_ev_fd);
 		kfree(ev_fd);
 		return ret;
 	}
 	ev_fd->eventfd_async = eventfd_async;
 
 	rcu_assign_pointer(ctx->io_ev_fd, ev_fd);
-	return ret;
+	return 0;
 }
 
 static void io_eventfd_put(struct rcu_head *rcu)

base-commit: 88a0394bc27de2dd8a8715970f289c5627052532

Signature · 1 line
2.35.1
#1 lore raw
Quoted 10 lines · Nathan Chancellor

Clang warns:

fs/io_uring.c:9396:9: warning: variable 'ret' is uninitialized when used here [-Wuninitialized]

          return ret;
                 ^~~
  fs/io_uring.c:9373:13: note: initialize the variable 'ret' to silence this warning
          int fd, ret;
                     ^
                      = 0
Quoted 7 lines

1 warning generated.

Just return 0 directly and reduce the scope of ret to the if statement, as that is the only place that it is used, which is how the function was before the fixes commit.

Fixes 1a75fac9a0f9 ("io_uring: avoid ring quiesce while registering/unregistering eventfd")

Did SHA's change? In linux-next, I see:
commit b77e315a9644 ("io_uring: avoid ring quiesce while registering/unregistering eventfd")
otherwise LGTM

Quoted 42 lines
---
 fs/io_uring.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
fs/io_uring.c +3 -3
index 5479f0607430..7ef04bb66da1 100644
@@ -9370,7 +9370,7 @@ static int io_eventfd_register(struct io_ring_ctx *ctx, void __user *arg,
 {
        struct io_ev_fd *ev_fd;
        __s32 __user *fds = arg;
-       int fd, ret;
+       int fd;
 
        ev_fd = rcu_dereference_protected(ctx->io_ev_fd,
                                        lockdep_is_held(&ctx->uring_lock));
@@ -9386,14 +9386,14 @@ static int io_eventfd_register(struct io_ring_ctx *ctx, void __user *arg,
 
        ev_fd->cq_ev_fd = eventfd_ctx_fdget(fd);
        if (IS_ERR(ev_fd->cq_ev_fd)) {
-               ret = PTR_ERR(ev_fd->cq_ev_fd);
+               int ret = PTR_ERR(ev_fd->cq_ev_fd);
                kfree(ev_fd);
                return ret;
        }
        ev_fd->eventfd_async = eventfd_async;
 
        rcu_assign_pointer(ctx->io_ev_fd, ev_fd);
-       return ret;
+       return 0;
 }
 
 static void io_eventfd_put(struct rcu_head *rcu)

base-commit: 88a0394bc27de2dd8a8715970f289c5627052532 --
2.35.1

Signature · 2 lines
Thanks,
~Nick Desaulniers
#2 lore raw
Quoted 17 lines · Nick Desaulniers
Quoted 16 lines · Nathan Chancellor

Clang warns:

fs/io_uring.c:9396:9: warning: variable 'ret' is uninitialized when used here [-Wuninitialized]

          return ret;
                 ^~~
  fs/io_uring.c:9373:13: note: initialize the variable 'ret' to silence this warning
          int fd, ret;
                     ^
                      = 0

1 warning generated.

Just return 0 directly and reduce the scope of ret to the if statement, as that is the only place that it is used, which is how the function was before the fixes commit.

Quoted 6 lines
Quoted 1 line
Fixes 1a75fac9a0f9 ("io_uring: avoid ring quiesce while registering/unregistering eventfd")

Did SHA's change? In linux-next, I see:
commit b77e315a9644 ("io_uring: avoid ring quiesce while registering/unregistering eventfd")
otherwise LGTM

Yes, this is against Jens' latest for-5.18/io_uring branch, which was rebased after next-20220207 was released.

https://git.kernel.dk/cgit/linux-block/log/?h=for-5.18/io_uring

Cheers,
Nathan

Quoted 47 lines
Quoted 42 lines
---
 fs/io_uring.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
fs/io_uring.c +3 -3
index 5479f0607430..7ef04bb66da1 100644
@@ -9370,7 +9370,7 @@ static int io_eventfd_register(struct io_ring_ctx *ctx, void __user *arg,
 {
        struct io_ev_fd *ev_fd;
        __s32 __user *fds = arg;
-       int fd, ret;
+       int fd;
 
        ev_fd = rcu_dereference_protected(ctx->io_ev_fd,
                                        lockdep_is_held(&ctx->uring_lock));
@@ -9386,14 +9386,14 @@ static int io_eventfd_register(struct io_ring_ctx *ctx, void __user *arg,
 
        ev_fd->cq_ev_fd = eventfd_ctx_fdget(fd);
        if (IS_ERR(ev_fd->cq_ev_fd)) {
-               ret = PTR_ERR(ev_fd->cq_ev_fd);
+               int ret = PTR_ERR(ev_fd->cq_ev_fd);
                kfree(ev_fd);
                return ret;
        }
        ev_fd->eventfd_async = eventfd_async;
 
        rcu_assign_pointer(ctx->io_ev_fd, ev_fd);
-       return ret;
+       return 0;
 }
 
 static void io_eventfd_put(struct rcu_head *rcu)

base-commit: 88a0394bc27de2dd8a8715970f289c5627052532 --
2.35.1

Signature · 2 lines
Thanks,
~Nick Desaulniers
Reviewed-by
#3 lore raw
Quoted 26 lines · Nathan Chancellor
Quoted 17 lines · Nick Desaulniers
Quoted 16 lines · Nathan Chancellor

Clang warns:

fs/io_uring.c:9396:9: warning: variable 'ret' is uninitialized when used here [-Wuninitialized]

          return ret;
                 ^~~
  fs/io_uring.c:9373:13: note: initialize the variable 'ret' to silence this warning
          int fd, ret;
                     ^
                      = 0

1 warning generated.

Just return 0 directly and reduce the scope of ret to the if statement, as that is the only place that it is used, which is how the function was before the fixes commit.

Quoted 6 lines
Quoted 1 line
Fixes 1a75fac9a0f9 ("io_uring: avoid ring quiesce while registering/unregistering eventfd")

Did SHA's change? In linux-next, I see:
commit b77e315a9644 ("io_uring: avoid ring quiesce while registering/unregistering eventfd")
otherwise LGTM

Quoted 4 lines

Yes, this is against Jens' latest for-5.18/io_uring branch, which was rebased after next-20220207 was released.

https://git.kernel.dk/cgit/linux-block/log/?h=for-5.18/io_uring

Thanks for the explanation.

Quoted 52 lines

Cheers,
Nathan

Quoted 47 lines
Quoted 37 lines
---
 fs/io_uring.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
fs/io_uring.c +3 -3
index 5479f0607430..7ef04bb66da1 100644
@@ -9370,7 +9370,7 @@ static int io_eventfd_register(struct io_ring_ctx *ctx, void __user *arg,
 {
        struct io_ev_fd *ev_fd;
        __s32 __user *fds = arg;
-       int fd, ret;
+       int fd;
 
        ev_fd = rcu_dereference_protected(ctx->io_ev_fd,
                                        lockdep_is_held(&ctx->uring_lock));
@@ -9386,14 +9386,14 @@ static int io_eventfd_register(struct io_ring_ctx *ctx, void __user *arg,
 
        ev_fd->cq_ev_fd = eventfd_ctx_fdget(fd);
        if (IS_ERR(ev_fd->cq_ev_fd)) {
-               ret = PTR_ERR(ev_fd->cq_ev_fd);
+               int ret = PTR_ERR(ev_fd->cq_ev_fd);
                kfree(ev_fd);
                return ret;
        }
        ev_fd->eventfd_async = eventfd_async;
 
        rcu_assign_pointer(ctx->io_ev_fd, ev_fd);
-       return ret;
+       return 0;
 }
 
 static void io_eventfd_put(struct rcu_head *rcu)
Quoted 5 lines

base-commit: 88a0394bc27de2dd8a8715970f289c5627052532 --
2.35.1

--
Thanks,
~Nick Desaulniers

Signature · 2 lines
Thanks,
~Nick Desaulniers
#4 lore raw
In reply to Nathan Chancellor
Quoted 15 lines · Nathan Chancellor

Clang warns:

   fs/io_uring.c:9396:9: warning: variable 'ret' is uninitialized when used here [-Wuninitialized]
           return ret;
                  ^~~
   fs/io_uring.c:9373:13: note: initialize the variable 'ret' to silence this warning
           int fd, ret;
                      ^
                       = 0
   1 warning generated.

Just return 0 directly and reduce the scope of ret to the if statement, as that is the only place that it is used, which is how the function was before the fixes commit.

Quoted 7 lines
Fixes 1a75fac9a0f9 ("io_uring: avoid ring quiesce while registering/unregistering eventfd")
---
  fs/io_uring.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)

Thanks for pointing this out. Just for some background in earlier revisions of the patch for "io_uring: avoid ring quiesce while registering/unregistering eventfd" the error return part was being handled differently, but ended up looking similar to before in the final revision that got merged, but i forgot to change this part back. Would it be possible to fold the below diff into the patch as well Jens? Thanks and sorry for missing this!

Regards,
Usama

Quoted 33 lines
fs/io_uring.c +3 -3
index 5479f0607430..7ef04bb66da1 100644
@@ -9370,7 +9370,7 @@ static int io_eventfd_register(struct io_ring_ctx *ctx, void __user *arg,
  {
  	struct io_ev_fd *ev_fd;
  	__s32 __user *fds = arg;
-	int fd, ret;
+	int fd;
 
  	ev_fd = rcu_dereference_protected(ctx->io_ev_fd,
  					lockdep_is_held(&ctx->uring_lock));
@@ -9386,14 +9386,14 @@ static int io_eventfd_register(struct io_ring_ctx *ctx, void __user *arg,
 
  	ev_fd->cq_ev_fd = eventfd_ctx_fdget(fd);
  	if (IS_ERR(ev_fd->cq_ev_fd)) {
-		ret = PTR_ERR(ev_fd->cq_ev_fd);
+		int ret = PTR_ERR(ev_fd->cq_ev_fd);
  		kfree(ev_fd);
  		return ret;
  	}
  	ev_fd->eventfd_async = eventfd_async;
 
  	rcu_assign_pointer(ctx->io_ev_fd, ev_fd);
-	return ret;
+	return 0;
  }
 
  static void io_eventfd_put(struct rcu_head *rcu)

base-commit: 88a0394bc27de2dd8a8715970f289c5627052532

maintainer Applied
#5 lore raw
In reply to Nathan Chancellor
Quoted 9 lines · Nathan Chancellor

Clang warns:

fs/io_uring.c:9396:9: warning: variable 'ret' is uninitialized when used here [-Wuninitialized]

          return ret;
                 ^~~
  fs/io_uring.c:9373:13: note: initialize the variable 'ret' to silence this warning
          int fd, ret;
                     ^
                      = 0
Quoted 3 lines

1 warning generated.

[...]

Applied, thanks!

[1/1] io_uring: Fix use of uninitialized ret in io_eventfd_register()

      commit: 4c65723081332607ca331072b0f8a90189e2e447

Best regards,

Signature · 1 line
Jens Axboe