Received: from eggs.gnu.org ([209.51.188.92]:50410) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLlkO-0005Sj-Tz for qemu-devel@nongnu.org; Wed, 01 May 2019 05:41:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLlkL-0006Al-Sk for qemu-devel@nongnu.org; Wed, 01 May 2019 05:41:52 -0400 Date: Wed, 1 May 2019 10:41:40 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Message-ID: <20190501094140.GO29808@redhat.com> Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= References: <002f222d86322a66276de39cb29796acffe384c1.1556666645.git.alistair.francis@wdc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <002f222d86322a66276de39cb29796acffe384c1.1556666645.git.alistair.francis@wdc.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 1/5] util/qemu-sockets: Fix GCC 9 build warnings List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alistair Francis Cc: "qemu-devel@nongnu.org" , "alistair23@gmail.com" , "kraxel@redhat.com" , "riku.voipio@iki.fi" , "laurent@vivier.eu" , "qemu-trivial@nongnu.org" On Tue, Apr 30, 2019 at 11:28:22PM +0000, Alistair Francis wrote: > Fix this warning when building with GCC9 on Fedora 30: > In function =E2=80=98strncpy=E2=80=99, > inlined from =E2=80=98unix_connect_saddr.isra.0=E2=80=99 at util/qe= mu-sockets.c:925:5: > /usr/include/bits/string_fortified.h:106:10: error: =E2=80=98__builtin_= strncpy=E2=80=99 specified bound 108 equals destination size [-Werror=3Ds= tringop-truncation] > 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (= __dest)); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~= ~~~~~~~~ > In function =E2=80=98strncpy=E2=80=99, > inlined from =E2=80=98unix_listen_saddr.isra.0=E2=80=99 at util/qem= u-sockets.c:880:5: >=20 > Signed-off-by: Alistair Francis > --- > util/qemu-sockets.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c > index 9705051690..8c3322958f 100644 > --- a/util/qemu-sockets.c > +++ b/util/qemu-sockets.c > @@ -829,7 +829,7 @@ static int unix_listen_saddr(UnixSocketAddress *sad= dr, > struct sockaddr_un un; > int sock, fd; > char *pathbuf =3D NULL; > - const char *path; > + const char *path QEMU_NONSTRING; > =20 > sock =3D qemu_socket(PF_UNIX, SOCK_STREAM, 0); > if (sock < 0) { > @@ -922,7 +922,7 @@ static int unix_connect_saddr(UnixSocketAddress *sa= ddr, Error **errp) > =20 > memset(&un, 0, sizeof(un)); > un.sun_family =3D AF_UNIX; > - strncpy(un.sun_path, saddr->path, sizeof(un.sun_path)); > + memcpy(un.sun_path, saddr->path, MIN(strlen(saddr->path), sizeof(u= n.sun_path))); > =20 > /* connect to peer */ > do { I think my proposed fix for this file is preferrable as it avoids repeated strlen calls=20 https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg02124.html Regards, Daniel --=20 |: https://berrange.com -o- https://www.flickr.com/photos/dberran= ge :| |: https://libvirt.org -o- https://fstop138.berrange.c= om :| |: https://entangle-photo.org -o- https://www.instagram.com/dberran= ge :|