From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=pass (2048-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202502 header.b=LtteYejN; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 1D0545A0274 for ; Mon, 17 Feb 2025 04:59:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202502; t=1739764772; bh=+cm8LGMzfb9Z71LZFrTQrSZbJPEjC/FQeDi1YRk+19k=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=LtteYejNQCejw/fRwBaAptd3pLB8k7wn6PhHgudiepcZam/DbGWG/KiOmgqR1tr1Q Jkph7QSFKRHBsr5USNuZUEZshNWSU8gwZ0vka7HOLFC8wn15aNBTUUei1wxCnd1yMg uApKjx9V6iTpx/WBNn2b7i0zdYntPo5cJH4SeLWhY38G6hqty/hhzR5jvx56aC1edt 1fXfwLaTLc9UwGjr0Pne2cusk0mCfuKSzmoTem85dz1CSL9jB2oFSqJMSGEJuz1S+c gkVbrkzLAlfEFraXXLy+gmKH37aLWUo4Xr41x42b2I/AeB+h5qfvbJ+gUs8OA/tJGl rkFxnKlgxpZaQ== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4Yx86r4f50z4wy1; Mon, 17 Feb 2025 14:59:32 +1100 (AEDT) Date: Mon, 17 Feb 2025 14:58:43 +1100 From: David Gibson To: Stefano Brivio Subject: Re: [PATCH v3] repair, passt-repair: Build and warning fixes for musl Message-ID: References: <20250215115608.3863202-1-sbrivio@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="+PBiqG4ELi0NcWJ4" Content-Disposition: inline In-Reply-To: <20250215115608.3863202-1-sbrivio@redhat.com> Message-ID-Hash: GWETCDBLXRHOSPKQATT6OEM3MOWEMKEP X-Message-ID-Hash: GWETCDBLXRHOSPKQATT6OEM3MOWEMKEP X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: passt-dev@passt.top X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: --+PBiqG4ELi0NcWJ4 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Feb 15, 2025 at 12:56:08PM +0100, Stefano Brivio wrote: > Checked against musl 1.2.5. >=20 > Signed-off-by: Stefano Brivio Reviewed-by: David Gibson > --- > v3: Now 100% more trusted, with cppcheck absolutely positive about us > initialising 'buf'. >=20 > v2: Now 100% more tested: don't try to use the whole buffer as > msg_controllen. >=20 > passt-repair.c | 4 +++- > repair.c | 13 +++++++++---- > 2 files changed, 12 insertions(+), 5 deletions(-) >=20 > diff --git a/passt-repair.c b/passt-repair.c > index 1174ae3..e0c366e 100644 > --- a/passt-repair.c > +++ b/passt-repair.c > @@ -63,6 +63,7 @@ int main(int argc, char **argv) > struct cmsghdr *cmsg; > struct msghdr msg; > struct iovec iov; > + size_t cmsg_len; > int op; > =20 > prctl(PR_SET_DUMPABLE, 0); > @@ -138,8 +139,9 @@ loop: > } > } > if (!n) { > + cmsg_len =3D cmsg->cmsg_len; /* socklen_t is 'unsigned' on musl */ > fprintf(stderr, "Invalid ancillary data length %zu from peer\n", > - cmsg->cmsg_len); > + cmsg_len); > _exit(1); > } > =20 > diff --git a/repair.c b/repair.c > index d288617..dac28a6 100644 > --- a/repair.c > +++ b/repair.c > @@ -13,6 +13,7 @@ > */ > =20 > #include > +#include > #include > =20 > #include "util.h" > @@ -145,9 +146,9 @@ void repair_handler(struct ctx *c, uint32_t events) > */ > int repair_flush(struct ctx *c) > { > - struct iovec iov =3D { &repair_cmd, sizeof(repair_cmd) }; > char buf[CMSG_SPACE(sizeof(int) * SCM_MAX_FD)] > - __attribute__ ((aligned(__alignof__(struct cmsghdr)))); > + __attribute__ ((aligned(__alignof__(struct cmsghdr)))) =3D { 0 }; > + struct iovec iov =3D { &repair_cmd, sizeof(repair_cmd) }; > struct cmsghdr *cmsg; > struct msghdr msg; > int8_t reply; > @@ -155,8 +156,12 @@ int repair_flush(struct ctx *c) > if (!repair_nfds) > return 0; > =20 > - msg =3D (struct msghdr){ NULL, 0, &iov, 1, > - buf, CMSG_SPACE(sizeof(int) * repair_nfds), 0 }; > + msg =3D (struct msghdr){ .msg_name =3D NULL, .msg_namelen =3D 0, > + .msg_iov =3D &iov, .msg_iovlen =3D 1, > + .msg_control =3D buf, > + .msg_controllen =3D CMSG_SPACE(sizeof(int) * > + repair_nfds), > + .msg_flags =3D 0 }; > cmsg =3D CMSG_FIRSTHDR(&msg); > =20 > cmsg->cmsg_level =3D SOL_SOCKET; --=20 David Gibson (he or they) | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you, not the other way | around. http://www.ozlabs.org/~dgibson --+PBiqG4ELi0NcWJ4 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmeys/IACgkQzQJF27ox 2GfyIA/+I5b+PB0n137OyEJnKttZoEp0pQNc/SwVsNDfZI7hdVjfygf9iukEnIAM UNp9zIz9rdIgBEACecen+C4etkMwEPZgX3ANHKjLpU8+5/twtAKWAR07eZ4MJMTX xMmHqpZGS/sBmwJvzECzHvxfVy2ZbtQbrFrFCe3EGsDqN+UuPe6XbtnPsLFiuNCx se8p9vzDlfazbNzRxyg78NHBOs0KmbWYm0tYdz0N6r/PZccRtsekxtMhH/QkhMX/ K9OryQ5RXO9IkA4+Sr6Ax87MHXuvhxR1reiMmLw5iP5VaTGf4cYAa+iz+l4v8xdy vLYLGw8L2LJOtYq5MpTzqsJCMMNQ4v/bktnB2/N7KzuQPTaMmddjRBVas8MCLKy6 Ae4QUIlDGWDAfk0ZQ8E4iIBHiGq6+K3/aCDEpA5B9qw2zSmQgGJhZPHwUExB7zOX yMkzMp/a6yF6CG8hvUIM1nMVzq1zBWAgDjVzda2OYtKjJZOoYf0CB4ca6MqN6Ka4 NcSPu0slJnojD1/JqE4nGFCvdkjjQBebkRAlcargvJh8o5V5dtFRodzf40qo8GUa i9jWd9j1kUdZcv51GFmiVv+snUx4NS4/UTnJDVQRdIZqFxyTbKNADwa6coGh9jIH Ui8D91c7Ha13seRyDFlC0J1TqdCH0hiW0lj4crq0ydi+HpFkcRw= =YdXW -----END PGP SIGNATURE----- --+PBiqG4ELi0NcWJ4--