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=hInUGc8U; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 3120E5A0008 for ; Thu, 03 Apr 2025 11:16:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202502; t=1743671811; bh=2Nls1hOOsX6LvmW39ov6BeNiEpTh07TFvwfIHIZ//oI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=hInUGc8UjSjA3QJR+cqCvN67bfTjze7f8uy1O5wMt3fhqT4iX7RV4HBM692hII7kb ZNSmXQGBCggItvPLKl1LorAKOTqrtkRKKrN0n1Xa2ZMxL8AybK3cXGFjB5AcZOp86F j6v4a97d4ZAFID+kXJG9NII+X3NwNofZG+Jpns2f1a5J7JsFZSmlKYFXU2Nu7rauw7 c3cCxALkEytpLgFrpOsAjbM8rHWOcD51akF3avWDO7sbhG7maadP4BdtlG75CQoW+5 PRMHgKZ29AOTfH8TAN7jCShJ6E/wlJG+9ng0G8PEV/EigXuA5FPA2RzhwgTTb9WX0S 8ZQjeoaufs9nA== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4ZSx2C41jxz4x3d; Thu, 3 Apr 2025 20:16:51 +1100 (AEDT) Date: Thu, 3 Apr 2025 16:47:40 +1100 From: David Gibson To: Laurent Vivier Subject: Re: [PATCH 15/18] dhcp: Convert to iov_tail Message-ID: References: <20250402172343.858187-1-lvivier@redhat.com> <20250402172343.858187-16-lvivier@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="oLBU9IcFhvWdCWjO" Content-Disposition: inline In-Reply-To: <20250402172343.858187-16-lvivier@redhat.com> Message-ID-Hash: B5T3HNLW4JS4OQK3VBLOURHE3H5OMPTD X-Message-ID-Hash: B5T3HNLW4JS4OQK3VBLOURHE3H5OMPTD 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: --oLBU9IcFhvWdCWjO Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Apr 02, 2025 at 07:23:40PM +0200, Laurent Vivier wrote: > Use packet_base() and extract headers using IOV_REMOVE_HEADER() > and IOV_PEEK_HEADER() rather than packet_get(). >=20 > Signed-off-by: Laurent Vivier > --- > dhcp.c | 38 ++++++++++++++++++++++---------------- > iov.c | 1 - > 2 files changed, 22 insertions(+), 17 deletions(-) >=20 > diff --git a/dhcp.c b/dhcp.c > index b0de04be6f27..f3167beb18b7 100644 > --- a/dhcp.c > +++ b/dhcp.c > @@ -302,27 +302,32 @@ static void opt_set_dns_search(const struct ctx *c,= size_t max_len) > */ > int dhcp(const struct ctx *c, const struct pool *p) > { > - size_t mlen, dlen, offset =3D 0, opt_len, opt_off =3D 0; > + size_t mlen, dlen, opt_len, opt_off =3D 0; > char macstr[ETH_ADDRSTRLEN]; > struct in_addr mask, dst; > const struct ethhdr *eh; > const struct iphdr *iph; > const struct udphdr *uh; > + struct iov_tail data; > struct msg const *m; > + struct msg mc; > + struct ethhdr ehc; > + struct iphdr iphc; > + struct udphdr uhc; > struct msg reply; > unsigned int i; > =20 > - eh =3D packet_get(p, 0, offset, sizeof(*eh), NULL); > - offset +=3D sizeof(*eh); > + if (!packet_base(p, 0, &data)) > + return -1; > =20 > - iph =3D packet_get(p, 0, offset, sizeof(*iph), NULL); > + eh =3D IOV_REMOVE_HEADER(&data, ehc); > + iph =3D IOV_PEEK_HEADER(&data, iphc); > if (!eh || !iph) > return -1; > =20 > - offset +=3D iph->ihl * 4UL; > - uh =3D packet_get(p, 0, offset, sizeof(*uh), &mlen); > - offset +=3D sizeof(*uh); > + data.off +=3D iph->ihl * 4UL; iov_drop(). > + uh =3D IOV_REMOVE_HEADER(&data, uhc); > if (!uh) > return -1; > =20 > @@ -332,7 +337,9 @@ int dhcp(const struct ctx *c, const struct pool *p) > if (c->no_dhcp) > return 1; > =20 > - m =3D packet_get(p, 0, offset, offsetof(struct msg, o), &opt_len); > + mlen =3D iov_tail_size(&data); > + m =3D (struct msg const *)iov_remove_header_(&data, &mc, offsetof(struc= t msg, o), > + __alignof__(struct msg)); > if (!m || > mlen !=3D ntohs(uh->len) - sizeof(*uh) || > mlen < offsetof(struct msg, o) || > @@ -355,25 +362,24 @@ int dhcp(const struct ctx *c, const struct pool *p) > memset(&reply.file, 0, sizeof(reply.file)); > reply.magic =3D m->magic; > =20 > - offset +=3D offsetof(struct msg, o); > - > for (i =3D 0; i < ARRAY_SIZE(opts); i++) > opts[i].clen =3D -1; > =20 > + opt_len =3D iov_tail_size(&data); > while (opt_off + 2 < opt_len) { > - const uint8_t *olen, *val; > + const uint8_t *olen; > uint8_t *type; > =20 > - type =3D packet_get(p, 0, offset + opt_off, 1, NULL); > - olen =3D packet_get(p, 0, offset + opt_off + 1, 1, NULL); > + type =3D iov_tail_ptr(&data, opt_off, 1); > + olen =3D iov_tail_ptr(&data, opt_off + 1, 1); I think you can and should use remove_header() for this as well. > if (!type || !olen) > return -1; > =20 > - val =3D packet_get(p, 0, offset + opt_off + 2, *olen, NULL); > - if (!val) > + if (iov_tail_size(&data) < opt_off + 2 + *olen) > return -1; > =20 > - memcpy(&opts[*type].c, val, *olen); > + iov_to_buf(&data.iov[0], data.cnt, data.off + opt_off + 2, > + &opts[*type].c, *olen); > opts[*type].clen =3D *olen; > opt_off +=3D *olen + 2; > } > diff --git a/iov.c b/iov.c > index 0c69379316aa..66f15585a61a 100644 > --- a/iov.c > +++ b/iov.c > @@ -253,7 +253,6 @@ bool iov_drop(struct iov_tail *tail, size_t len) > * Returns: pointer to the data in the tail, NULL if the > * tail doesn't contains @len bytes. > */ > -/* cppcheck-suppress unusedFunction */ > void *iov_tail_ptr(struct iov_tail *tail, size_t off, size_t len) > { > const struct iovec *iov; --=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 --oLBU9IcFhvWdCWjO Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmfuIPsACgkQzQJF27ox 2GfB7A//Vv6MY/lNjp8aV4GaiF6+calgAPIMZMgLstiuZSwm5iv9yxcGaL8XT0g8 MpwgvHQabK9yl3jl7FneTrlbtdPPnR2gUuHkGqgGutJbkc4/eay3+ti6pMYAbOFA 7IbXbpN9AReMXnU316xwfdAKfZsOx6XTzhZzitWVoqer9OAYU1BPfm6/2FXctIol oo0huFrFBYGK8yEzZq7Fd6GLr2+V83W9+YNGtcNl/ZllrHw7ChuQCOUa2Dif06AW b537IVSSy/gWlQlK1JPg1I20Z4hNPLyLDg+jwdbg/kG1ib1swpcKLaIIrbN3Fgay 8N3dUA3+FYckOkdSJao4gsf41YIvOdrOFIU08MC3dvxcFTa+SaehF0NTFMOiLSpF STDLY0cZF+WzRzdms7LfATGjt0QaEsTF32Ysi8TvGA4PPciZfFGnqxRsCMCDma1o vS6ATrl2coGflfM6+T7xAiJwD55vjkMZbyCRRE1sJPeTs7qMlRZmG4Dmu+Aw88sl HzWjroIh+x9UnN+hNtXbk6QXcDnr9jxYdaniEPomdA+IL6LT5YdDz+iCKtIK5RKW dPXQKYL8k+c3fFJz/wNRBsFBc48T3ikacvu31kwsETTmA7evbFr8lQIofdI8kWzE RACUEm3bdmDWjX45AjtGrlNi/XPZihi+f2RtWjR5ZCi939C8cEE= =pHru -----END PGP SIGNATURE----- --oLBU9IcFhvWdCWjO--