Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 15 Jul 2022 22:33:51 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Dylan Yudaken <dylany@fb.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build warning after merge of the block tree
Message-ID: <20220715223351.2e8c856e@canb.auug.org.au>
In-Reply-To: <20220715135232.74b81bec@canb.auug.org.au>
References: <20220715135232.74b81bec@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/lBfOV4Gxbf1czM/GxNJwJhc";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/lBfOV4Gxbf1czM/GxNJwJhc
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Fri, 15 Jul 2022 13:52:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>=20
> After merging the block tree, today's linux-next build (arm
> multi_v7_defconfig) produced this warning:
>=20
> In file included from include/linux/slab.h:16,
>                  from io_uring/net.c:5:
> io_uring/net.c: In function 'io_recvmsg_multishot_overflow':
> include/linux/overflow.h:67:22: warning: comparison of distinct pointer t=
ypes lacks a cast
>    67 |         (void) (&__a =3D=3D &__b);                  \
>       |                      ^~
> io_uring/net.c:332:13: note: in expansion of macro 'check_add_overflow'
>   332 |         if (check_add_overflow(sizeof(struct io_uring_recvmsg_out=
),
>       |             ^~~~~~~~~~~~~~~~~~
> include/linux/overflow.h:68:22: warning: comparison of distinct pointer t=
ypes lacks a cast
>    68 |         (void) (&__a =3D=3D __d);                   \
>       |                      ^~
> io_uring/net.c:332:13: note: in expansion of macro 'check_add_overflow'
>   332 |         if (check_add_overflow(sizeof(struct io_uring_recvmsg_out=
),
>       |             ^~~~~~~~~~~~~~~~~~
> include/linux/overflow.h:67:22: warning: comparison of distinct pointer t=
ypes lacks a cast
>    67 |         (void) (&__a =3D=3D &__b);                  \
>       |                      ^~
> io_uring/net.c:335:13: note: in expansion of macro 'check_add_overflow'
>   335 |         if (check_add_overflow(hdr, iomsg->controllen, &hdr))
>       |             ^~~~~~~~~~~~~~~~~~
>=20
> Introduced by commit
>=20
>   a8b38c4ce724 ("io_uring: support multishot in recvmsg")

This became a build failure in my i386 defconfig build.  So I have
applied the following (probably not correct) patch that makes it build.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 15 Jul 2022 21:55:32 +1000
Subject: [PATCH] fix up for "io_uring: support multishot in recvmsg"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 io_uring/net.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/io_uring/net.c b/io_uring/net.c
index 616d5f04cc74..187822e18dd6 100644
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -329,10 +329,10 @@ static bool io_recvmsg_multishot_overflow(struct io_a=
sync_msghdr *iomsg)
 {
 	unsigned long hdr;
=20
-	if (check_add_overflow(sizeof(struct io_uring_recvmsg_out),
+	if (check_add_overflow((unsigned long)sizeof(struct io_uring_recvmsg_out),
 			       (unsigned long)iomsg->namelen, &hdr))
 		return true;
-	if (check_add_overflow(hdr, iomsg->controllen, &hdr))
+	if (check_add_overflow(hdr, (unsigned long)iomsg->controllen, &hdr))
 		return true;
 	if (hdr > INT_MAX)
 		return true;
--=20
2.35.1

--=20
Cheers,
Stephen Rothwell

--Sig_/lBfOV4Gxbf1czM/GxNJwJhc
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmLRXq8ACgkQAVBC80lX
0GzTOAgAopI7rp2ln4TRvOS2Bw/kot8mIvaSyqzVVCRjLdbWjbHOC4+BwEjwCFXC
vzBCkRaV5+/bfJ5Z3QTjfMQXGwsHWRrPHvnNDIoxLpDbc/Ap1hR+P//5m8HRFbkz
jSeHzvh7/zhIzWG8PUPxXOFSG7okqx+qMz1dZe/LAN4W0KRMd8WyfubUI/X4KVL7
VB+pPLBVUpEqt21X0FI6mZ+FYPekrjedFHDkCYxVgRPNpTWRYsbeIAH+RQpT7fzF
yJUHlQNUBBsHUfzvVT65jj2f/kpO8rIPZ8lPsz/xc/PKuB+6N/49L++bgPFgBgJr
o63y8APBYIgoMaoNx5Wm6VGZkBnB8A==
=zv9s
-----END PGP SIGNATURE-----

--Sig_/lBfOV4Gxbf1czM/GxNJwJhc--