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=lOUcdtEs; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id F120F5A0008 for ; Thu, 03 Apr 2025 07:38:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202502; t=1743658684; bh=VUWkNK6fMSND05xprrcGhn/gmLrInJRcrcVa1oiyBqA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=lOUcdtEsK5x0oB6FPWAnh8QTxb3dH5QpoJhUF6KRtpADpdNoE10MWQ4YKd5XigwLe WCtqcQGUL5ixd2geCUL85tu7udJSAJMEv4pZxfmOQtJBIuRgpGw5YQEbHP4q0MY+Sg LCMnQUnTGep7cNwUy5v3NtZO/6zj3U8ryQJDfkpu8dvM5d7YHA3VPdEBc2Gkd1DCbB Zd+DjipkfpYEQmB7oFTb7CDm3RNaBpnPwg/je57R3irow4i+X/1EGdahcT21Exz0JX Gxc+Fwc3iSiJqDeXiWKmRRd2JNnyJlj28Ts79EWPitH9ODRN0S6GzSkdnD3fXV25yf rP9oiWl20ZxYQ== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4ZSr9m5nVCz4xN6; Thu, 3 Apr 2025 16:38:04 +1100 (AEDT) Date: Thu, 3 Apr 2025 16:25:58 +1100 From: David Gibson To: Laurent Vivier Subject: Re: [PATCH 13/18] dhcpv6: move offset initialization out of dhcpv6_opt() Message-ID: References: <20250402172343.858187-1-lvivier@redhat.com> <20250402172343.858187-14-lvivier@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="HyksIZHjgKiQ/rRa" Content-Disposition: inline In-Reply-To: <20250402172343.858187-14-lvivier@redhat.com> Message-ID-Hash: YGL7EFP7D47NIV2SIIAW57BTBAVFAHHF X-Message-ID-Hash: YGL7EFP7D47NIV2SIIAW57BTBAVFAHHF 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: --HyksIZHjgKiQ/rRa Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Apr 02, 2025 at 07:23:38PM +0200, Laurent Vivier wrote: Needs a commit message. > Signed-off-by: Laurent Vivier > --- > dhcpv6.c | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) >=20 > diff --git a/dhcpv6.c b/dhcpv6.c > index eb3f188af0b5..ccc64172a480 100644 > --- a/dhcpv6.c > +++ b/dhcpv6.c > @@ -54,14 +54,14 @@ struct opt_hdr { > uint16_t l; > } __attribute__((packed)); > =20 > +#define UDP_MSG_HDR_SIZE (sizeof(struct udphdr) + sizeof(struct msg_hdr)) > # define OPT_SIZE_CONV(x) (htons_constant(x)) > #define OPT_SIZE(x) OPT_SIZE_CONV(sizeof(struct opt_##x) - \ > sizeof(struct opt_hdr)) > #define OPT_VSIZE(x) (sizeof(struct opt_##x) - \ > sizeof(struct opt_hdr)) > #define OPT_MAX_SIZE IPV6_MIN_MTU - (sizeof(struct ipv6hdr) + \ > - sizeof(struct udphdr) + \ > - sizeof(struct msg_hdr)) > + UDP_MSG_HDR_SIZE) > =20 > /** > * struct opt_client_id - DHCPv6 Client Identifier option > @@ -290,8 +290,7 @@ static struct opt_hdr *dhcpv6_opt(const struct pool *= p, size_t *offset, > struct opt_hdr *o; > size_t left; > =20 > - if (!*offset) > - *offset =3D sizeof(struct udphdr) + sizeof(struct msg_hdr); > + ASSERT(*offset >=3D UDP_MSG_HDR_SIZE); > =20 > while ((o =3D packet_get_try(p, 0, *offset, sizeof(*o), &left))) { > unsigned int opt_len =3D ntohs(o->l) + sizeof(*o); > @@ -327,7 +326,7 @@ static struct opt_hdr *dhcpv6_ia_notonlink(const stru= ct pool *p, > size_t offset; > =20 > foreach(ia_type, ia_types) { > - offset =3D 0; > + offset =3D UDP_MSG_HDR_SIZE; > while ((ia =3D dhcpv6_opt(p, &offset, *ia_type))) { > if (ntohs(ia->l) < OPT_VSIZE(ia_na)) > return NULL; > @@ -464,8 +463,9 @@ static size_t dhcpv6_client_fqdn_fill(const struct po= ol *p, const struct ctx *c, > =20 > o =3D (struct opt_client_fqdn *)(buf + offset); > encode_domain_name(o->domain_name, c->fqdn); > - req_opt =3D (struct opt_client_fqdn *)dhcpv6_opt(p, &(size_t){ 0 }, > - OPT_CLIENT_FQDN); > + req_opt =3D (struct opt_client_fqdn *)dhcpv6_opt(p, > + &(size_t){ UDP_MSG_HDR_SIZE }, > + OPT_CLIENT_FQDN); > if (req_opt && req_opt->flags & 0x01 /* S flag */) > o->flags =3D 0x02 /* O flag */; > else > @@ -529,15 +529,15 @@ int dhcpv6(struct ctx *c, const struct pool *p, > if (!mh) > return -1; > =20 > - client_id =3D dhcpv6_opt(p, &(size_t){ 0 }, OPT_CLIENTID); > + client_id =3D dhcpv6_opt(p, &(size_t){ UDP_MSG_HDR_SIZE }, OPT_CLIENTID= ); > if (!client_id || ntohs(client_id->l) > OPT_VSIZE(client_id)) > return -1; > =20 > - server_id =3D dhcpv6_opt(p, &(size_t){ 0 }, OPT_SERVERID); > + server_id =3D dhcpv6_opt(p, &(size_t){ UDP_MSG_HDR_SIZE }, OPT_SERVERID= ); > if (server_id && ntohs(server_id->l) !=3D OPT_VSIZE(server_id)) > return -1; > =20 > - ia =3D dhcpv6_opt(p, &(size_t){ 0 }, OPT_IA_NA); > + ia =3D dhcpv6_opt(p, &(size_t){ UDP_MSG_HDR_SIZE }, OPT_IA_NA); > if (ia && ntohs(ia->l) < MIN(OPT_VSIZE(ia_na), OPT_VSIZE(ia_ta))) > return -1; > =20 > @@ -587,7 +587,7 @@ int dhcpv6(struct ctx *c, const struct pool *p, > memcmp(&resp.server_id, server_id, sizeof(resp.server_id))) > return -1; > =20 > - if (ia || dhcpv6_opt(p, &(size_t){ 0 }, OPT_IA_TA)) > + if (ia || dhcpv6_opt(p, &(size_t){ UDP_MSG_HDR_SIZE }, OPT_IA_TA)) > return -1; > =20 > info("DHCPv6: received INFORMATION_REQUEST, sending REPLY"); --=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 --HyksIZHjgKiQ/rRa Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmfuG+UACgkQzQJF27ox 2GevKRAAgciY8HX3VHmYG0Yf7W4hpXlEZiJ2MhPAb5sP8mv2vP7rrTA7HAmrVVnb ln/yzi8fN8r4Jl2ETyoAb8zbc3GZaDN/LIetAG0Pn/OP7GXUDSyAusV1kJkQu4kC FKzAQIJvgHKipYTCVyN4PwfAs4Rh0BaifzT2Owyz7dKSMGQuB+IjJUzuShMXRIAR jPPEFWiz+HdbsUznnwT95GzgBncK2tYRkvdY/MCeIPCncyZUMjDHo+CU4q8ihVTc 6BZr+6uvRPoOGQnS+anFBO6fzQQB9hJXh3D4wKmhhg6SpFp8B/skpnsHsL3oG91V vVhL01Oka22aX2MmSh15xbzdrXA6B0Tulk4mxAJ8besjA5XDMQd9zHADpy2D7WSr 5fkEq/hXMgPdb5ulmEzJNmmf6PBZQ+f4ec/XNlAWlFCONnj8R0lxs+uWtsfD21q3 8XVvzXYn6VxcXATz2nm0ZcqiXUGv1AUFuyeJi4qPNcu/GCw14w2FD0lq4Y8KHiY7 /nyjsrMzM49guBCaMHSyfgVTUDr7PmiphetpVE5eUoGLoSNKqJJK1bdiPco/fT53 L4A2TF1UYB+a87ZUg0osSwbQydVpA5YcntWv9dLnE2yg6BjBCSZBArRjtgK/G+d3 1XMOuGOPca80/QiVMwh0vYcutnEfNOvmcXGRHAc8pZy+CCHB8TE= =lknt -----END PGP SIGNATURE----- --HyksIZHjgKiQ/rRa--