From: Dylan Yudaken <[email protected]>
To: Jens Axboe <[email protected]>,
Pavel Begunkov <[email protected]>,
<[email protected]>
Cc: <[email protected]>, <[email protected]>,
Dylan Yudaken <[email protected]>
Subject: [PATCH for-next] io_uring: fix types in io_recvmsg_multishot_overflow
Date: Fri, 15 Jul 2022 06:02:52 -0700 [thread overview]
Message-ID: <[email protected]> (raw)
io_recvmsg_multishot_overflow had incorrect types on non x64 system.
But also it had an unnecessary INT_MAX check, which could just be done
by changing the type of the accumulator to int (also simplifying the
casts).
Reported-by: Stephen Rothwell <[email protected]>
Fixes: a8b38c4ce724 ("io_uring: support multishot in recvmsg")
Signed-off-by: Dylan Yudaken <[email protected]>
---
io_uring/net.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/io_uring/net.c b/io_uring/net.c
index 616d5f04cc74..6b7d5f33e642 100644
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -327,14 +327,14 @@ int io_send(struct io_kiocb *req, unsigned int issue_flags)
static bool io_recvmsg_multishot_overflow(struct io_async_msghdr *iomsg)
{
- unsigned long hdr;
+ int hdr;
- if (check_add_overflow(sizeof(struct io_uring_recvmsg_out),
- (unsigned long)iomsg->namelen, &hdr))
+ if (iomsg->namelen < 0)
return true;
- if (check_add_overflow(hdr, iomsg->controllen, &hdr))
+ if (check_add_overflow((int)sizeof(struct io_uring_recvmsg_out),
+ iomsg->namelen, &hdr))
return true;
- if (hdr > INT_MAX)
+ if (check_add_overflow(hdr, (int)iomsg->controllen, &hdr))
return true;
return false;
base-commit: a8b38c4ce7240d869c820d457bcd51e452149510
--
2.30.2
next reply other threads:[~2022-07-15 13:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-15 13:02 Dylan Yudaken [this message]
2022-07-15 13:33 ` [PATCH for-next] io_uring: fix types in io_recvmsg_multishot_overflow 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 \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/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