[1/1] io_uring: fix invalid hybrid polling ctx leaks

Commit Message

Pavel Begunkov Nov. 13, 2024, 3:26 a.m. UTC

It has already allocated the ctx by the point where it checks the hybrid
poll configuration, plain return leaks the memory.

Fixes: 01ee194d1aba1 ("io_uring: add support for hybrid IOPOLL")
Signed-off-by: Pavel Begunkov <[e-mail]>
---
 io_uring/io_uring.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Anuj Gupta Nov. 13, 2024, 5:19 a.m. UTC | #1

Reviewed-by: Anuj Gupta <[e-mail]>

Jens Axboe Nov. 13, 2024, 2:39 p.m. UTC | #2

On Wed, 13 Nov 2024 03:26:01 +0000, Pavel Begunkov wrote:
> It has already allocated the ctx by the point where it checks the hybrid
> poll configuration, plain return leaks the memory.
> 
> 

Applied, thanks!

[1/1] io_uring: fix invalid hybrid polling ctx leaks
      commit: b9d69371e8fa90fa3ab100f4fcb4815b13b3673a

Best regards,

Patch

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index f34fa1ead2cf..8a7b5a899d46 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -3915,11 +3915,6 @@  static __cold int io_uring_create(unsigned entries, struct io_uring_params *p,
 	if (!(ctx->flags & IORING_SETUP_NO_SQARRAY))
 		static_branch_inc(&io_key_has_sqarray);
 
-	/* HYBRID_IOPOLL only valid with IOPOLL */
-	if ((ctx->flags & (IORING_SETUP_IOPOLL|IORING_SETUP_HYBRID_IOPOLL)) ==
-			IORING_SETUP_HYBRID_IOPOLL)
-		return -EINVAL;
-
 	if ((ctx->flags & IORING_SETUP_DEFER_TASKRUN) &&
 	    !(ctx->flags & IORING_SETUP_IOPOLL) &&
 	    !(ctx->flags & IORING_SETUP_SQPOLL))
@@ -3970,6 +3965,11 @@  static __cold int io_uring_create(unsigned entries, struct io_uring_params *p,
 		ctx->notify_method = TWA_SIGNAL;
 	}
 
+	/* HYBRID_IOPOLL only valid with IOPOLL */
+	if ((ctx->flags & (IORING_SETUP_IOPOLL|IORING_SETUP_HYBRID_IOPOLL)) ==
+			IORING_SETUP_HYBRID_IOPOLL)
+		goto err;
+
 	/*
 	 * For DEFER_TASKRUN we require the completion task to be the same as the
 	 * submission task. This implies that there is only one submitter, so enforce