mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Wan Jiabing <wanjiabing@vivo.com>
To: Jens Axboe <axboe@kernel.dk>,
	Pavel Begunkov <asml.silence@gmail.com>,
	io-uring@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Wan Jiabing <wanjiabing@vivo.com>
Subject: [PATCH] io_uring: Fix incorrect variable type in io_fixed_fd_install
Date: Thu, 12 May 2022 20:05:11 +0800	[thread overview]
Message-ID: <20220512120511.4306-1-wanjiabing@vivo.com> (raw)

Fix following coccicheck warning:
fs/io_uring.c:5352:15-24: WARNING: Unsigned expression compared with zero: file_slot < 0

'file_slot' is an unsigned variable and it can't be less than 0.
Use 'ret' instead to check the error code from io_file_bitmap_get().

And using bool to declare 'alloc_slot' makes the code better.  

Fixes: 08cf52bc6eb4 ("io_uring: allow allocated fixed files for openat/openat2")
Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
---
 fs/io_uring.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index e8f5106434ad..92d0321bdefe 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -5342,17 +5342,19 @@ static int io_file_bitmap_get(struct io_ring_ctx *ctx)
 static int io_fixed_fd_install(struct io_kiocb *req, unsigned int issue_flags,
 			       struct file *file, unsigned int file_slot)
 {
-	int alloc_slot = file_slot == IORING_FILE_INDEX_ALLOC;
+	bool alloc_slot = file_slot == IORING_FILE_INDEX_ALLOC;
 	struct io_ring_ctx *ctx = req->ctx;
 	int ret;
 
 	if (alloc_slot) {
 		io_ring_submit_lock(ctx, issue_flags);
-		file_slot = io_file_bitmap_get(ctx);
-		if (unlikely(file_slot < 0)) {
+		ret = io_file_bitmap_get(ctx);
+		if (unlikely(ret < 0)) {
 			io_ring_submit_unlock(ctx, issue_flags);
-			return file_slot;
+			return ret;
 		}
+
+		file_slot = ret;
 	}
 
 	ret = io_install_fixed_file(req, file, issue_flags, file_slot);
-- 
2.35.1


             reply	other threads:[~2022-05-12 12:05 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-12 12:05 Wan Jiabing [this message]
2022-05-12 12:21 ` Jens Axboe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220512120511.4306-1-wanjiabing@vivo.com \
    --to=wanjiabing@vivo.com \
    --cc=asml.silence@gmail.com \
    --cc=axboe@kernel.dk \
    --cc=io-uring@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®