| Message ID | 20220715130252.610639-1-dylany@fb.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [for-next] io_uring: fix types in io_recvmsg_multishot_overflow | expand |
On Fri, 15 Jul 2022 06:02:52 -0700, Dylan Yudaken wrote: > 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). > > Applied, thanks! [1/1] io_uring: fix types in io_recvmsg_multishot_overflow commit: 184d0a67566383f4f9e85101e4af495abe86f215 Best regards,
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;
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 <sfr@canb.auug.org.au> Fixes: a8b38c4ce724 ("io_uring: support multishot in recvmsg") Signed-off-by: Dylan Yudaken <dylany@fb.com> --- io_uring/net.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) base-commit: a8b38c4ce7240d869c820d457bcd51e452149510