Commit 9b0fc3c0 authored by Dylan Yudaken's avatar Dylan Yudaken Committed by Jens Axboe
Browse files

io_uring: fix types in io_recvmsg_multishot_overflow 



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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Fixes: a8b38c4ce724 ("io_uring: support multishot in recvmsg")
Signed-off-by: default avatarDylan Yudaken <dylany@fb.com>
Link: https://lore.kernel.org/r/20220715130252.610639-1-dylany@fb.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 4ccc6db0

io_uring/net.c

+5 −5
Original line number Diff line number Diff line
@@ -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;