From: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu, 12 May 2022 00:30:20 +0000 (-0400)
Subject: io_uring_enter(): don't leave f.flags uninitialized
X-Git-Tag: v5.19-rc1~20^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4329490a78b66ae44a9c93e433da375284162e3d;p=thirdparty%2Fkernel%2Flinux.git

io_uring_enter(): don't leave f.flags uninitialized

simplifies logics on cleanup, as well...

Reviewed-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/fs/io_uring.c b/fs/io_uring.c
index a8413f0064170..dc580a30723d0 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -10961,14 +10961,14 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned int, fd, u32, to_submit,
 			return -EINVAL;
 		fd = array_index_nospec(fd, IO_RINGFD_REG_MAX);
 		f.file = tctx->registered_rings[fd];
-		if (unlikely(!f.file))
-			return -EBADF;
+		f.flags = 0;
 	} else {
 		f = fdget(fd);
-		if (unlikely(!f.file))
-			return -EBADF;
 	}
 
+	if (unlikely(!f.file))
+		return -EBADF;
+
 	ret = -EOPNOTSUPP;
 	if (unlikely(f.file->f_op != &io_uring_fops))
 		goto out_fput;
@@ -11041,8 +11041,7 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned int, fd, u32, to_submit,
 out:
 	percpu_ref_put(&ctx->refs);
 out_fput:
-	if (!(flags & IORING_ENTER_REGISTERED_RING))
-		fdput(f);
+	fdput(f);
 	return submitted ? submitted : ret;
 }