From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: passt.top; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=OEK0dJp3; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by passt.top (Postfix) with ESMTPS id 294CD5A061E for ; Wed, 02 Apr 2025 19:24:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743614651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=N5WMcc0HYdXg5i4mP5nYTb2n1XAREb8+p8glGU/kzEw=; b=OEK0dJp3vYcZeHTyKvvKroux5bSV0l6DYWrEz5whlTCIHMHiwhvmklJJtEc9bMYKxFizNZ mszik7Wn7mR+yXdDz7VUX5PxtWnlyKK1L4wYmnSysEaMJRDi20KWrfzSi3lpk+d74MgHJz v1/wUSBXU8ECbGrf3lhX/R/SnQ7jb/s= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-363-MYHgEIhgPjGxRJtktMl7FQ-1; Wed, 02 Apr 2025 13:24:08 -0400 X-MC-Unique: MYHgEIhgPjGxRJtktMl7FQ-1 X-Mimecast-MFC-AGG-ID: MYHgEIhgPjGxRJtktMl7FQ_1743614648 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DF63119560BB for ; Wed, 2 Apr 2025 17:24:07 +0000 (UTC) Received: from lenovo-t14s.redhat.com (unknown [10.44.33.101]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B1C9419560AD; Wed, 2 Apr 2025 17:24:06 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH 14/18] dhcpv6: Use iov_tail in dhcpv6_opt() Date: Wed, 2 Apr 2025 19:23:39 +0200 Message-ID: <20250402172343.858187-15-lvivier@redhat.com> In-Reply-To: <20250402172343.858187-1-lvivier@redhat.com> References: <20250402172343.858187-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: sjEsr-kcJwQ3CZXTW3teA8VfqD18vHiIhbMlhXHTQbA_1743614648 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: JV5HTW63OYQTE7P2KVGBGVQ2MGAZT5NQ X-Message-ID-Hash: JV5HTW63OYQTE7P2KVGBGVQ2MGAZT5NQ X-MailFrom: lvivier@redhat.com 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: Laurent Vivier 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: Signed-off-by: Laurent Vivier --- dhcpv6.c | 57 +++++++++++++++++++++++++++----------------------------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/dhcpv6.c b/dhcpv6.c index ccc64172a480..1e83f2c2ad23 100644 --- a/dhcpv6.c +++ b/dhcpv6.c @@ -278,30 +278,25 @@ static struct resp_not_on_link_t { /** * dhcpv6_opt() - Get option from DHCPv6 message - * @p: Packet pool, single packet with UDP header - * @offset: Offset to look at, 0: end of header, set to option start + * @data: Data to look at * @type: Option type to look up, network order * * Return: pointer to option header, or NULL on malformed or missing option */ -static struct opt_hdr *dhcpv6_opt(const struct pool *p, size_t *offset, - uint16_t type) +static struct opt_hdr *dhcpv6_opt(struct iov_tail *data, uint16_t type) { - struct opt_hdr *o; - size_t left; + struct opt_hdr *o, oc; - ASSERT(*offset >= UDP_MSG_HDR_SIZE); - - while ((o = packet_get_try(p, 0, *offset, sizeof(*o), &left))) { + while ((o = IOV_PEEK_HEADER(data, oc))) { unsigned int opt_len = ntohs(o->l) + sizeof(*o); - if (ntohs(o->l) > left) + if (opt_len > iov_tail_size(data)) return NULL; if (o->t == type) return o; - *offset += opt_len; + data->off += opt_len; } return NULL; @@ -309,31 +304,31 @@ static struct opt_hdr *dhcpv6_opt(const struct pool *p, size_t *offset, /** * dhcpv6_ia_notonlink() - Check if any IA contains non-appropriate addresses - * @p: Packet pool, single packet starting from UDP header + * @data: Data to look at, packet starting from UDP header * @la: Address we want to lease to the client * * Return: pointer to non-appropriate IA_NA or IA_TA, if any, NULL otherwise */ -static struct opt_hdr *dhcpv6_ia_notonlink(const struct pool *p, +static struct opt_hdr *dhcpv6_ia_notonlink(const struct iov_tail *data, struct in6_addr *la) { int ia_types[2] = { OPT_IA_NA, OPT_IA_TA }, *ia_type; const struct opt_ia_addr *opt_addr; char buf[INET6_ADDRSTRLEN]; struct in6_addr req_addr; + struct iov_tail current; const struct opt_hdr *h; struct opt_hdr *ia; - size_t offset; foreach(ia_type, ia_types) { - offset = UDP_MSG_HDR_SIZE; - while ((ia = dhcpv6_opt(p, &offset, *ia_type))) { + current = *data; + while ((ia = dhcpv6_opt(¤t, *ia_type))) { if (ntohs(ia->l) < OPT_VSIZE(ia_na)) return NULL; - offset += sizeof(struct opt_ia_na); + current.off += sizeof(struct opt_ia_na); - while ((h = dhcpv6_opt(p, &offset, OPT_IAAADR))) { + while ((h = dhcpv6_opt(¤t, OPT_IAAADR))) { if (ntohs(h->l) != OPT_VSIZE(ia_addr)) return NULL; @@ -342,7 +337,7 @@ static struct opt_hdr *dhcpv6_ia_notonlink(const struct pool *p, if (!IN6_ARE_ADDR_EQUAL(la, &req_addr)) goto err; - offset += sizeof(struct opt_ia_addr); + current.off += sizeof(struct opt_ia_addr); } } } @@ -434,13 +429,15 @@ search: /** * dhcpv6_client_fqdn_fill() - Fill in client FQDN option + * @data: Data to look at * @c: Execution context * @buf: Response message buffer where options will be appended * @offset: Offset in message buffer for new options * * Return: updated length of response message buffer. */ -static size_t dhcpv6_client_fqdn_fill(const struct pool *p, const struct ctx *c, +static size_t dhcpv6_client_fqdn_fill(struct iov_tail *data, + const struct ctx *c, char *buf, int offset) { @@ -463,9 +460,8 @@ static size_t dhcpv6_client_fqdn_fill(const struct pool *p, const struct ctx *c, o = (struct opt_client_fqdn *)(buf + offset); encode_domain_name(o->domain_name, c->fqdn); - req_opt = (struct opt_client_fqdn *)dhcpv6_opt(p, - &(size_t){ UDP_MSG_HDR_SIZE }, - OPT_CLIENT_FQDN); + data->off += UDP_MSG_HDR_SIZE; + req_opt = (struct opt_client_fqdn *)dhcpv6_opt(data, OPT_CLIENT_FQDN); if (req_opt && req_opt->flags & 0x01 /* S flag */) o->flags = 0x02 /* O flag */; else @@ -525,19 +521,19 @@ int dhcpv6(struct ctx *c, const struct pool *p, src = &c->ip6.our_tap_ll; - mh = IOV_PEEK_HEADER(&data, mhc); + mh = IOV_REMOVE_HEADER(&data, mhc); if (!mh) return -1; - client_id = dhcpv6_opt(p, &(size_t){ UDP_MSG_HDR_SIZE }, OPT_CLIENTID); + client_id = dhcpv6_opt(&data, OPT_CLIENTID); if (!client_id || ntohs(client_id->l) > OPT_VSIZE(client_id)) return -1; - server_id = dhcpv6_opt(p, &(size_t){ UDP_MSG_HDR_SIZE }, OPT_SERVERID); + server_id = dhcpv6_opt(&data, OPT_SERVERID); if (server_id && ntohs(server_id->l) != OPT_VSIZE(server_id)) return -1; - ia = dhcpv6_opt(p, &(size_t){ UDP_MSG_HDR_SIZE }, OPT_IA_NA); + ia = dhcpv6_opt(&data, OPT_IA_NA); if (ia && ntohs(ia->l) < MIN(OPT_VSIZE(ia_na), OPT_VSIZE(ia_ta))) return -1; @@ -553,7 +549,7 @@ int dhcpv6(struct ctx *c, const struct pool *p, if (mh->type == TYPE_CONFIRM && server_id) return -1; - if ((bad_ia = dhcpv6_ia_notonlink(p, &c->ip6.addr))) { + if ((bad_ia = dhcpv6_ia_notonlink(&data, &c->ip6.addr))) { info("DHCPv6: received CONFIRM with inappropriate IA," " sending NotOnLink status in REPLY"); @@ -587,7 +583,7 @@ int dhcpv6(struct ctx *c, const struct pool *p, memcmp(&resp.server_id, server_id, sizeof(resp.server_id))) return -1; - if (ia || dhcpv6_opt(p, &(size_t){ UDP_MSG_HDR_SIZE }, OPT_IA_TA)) + if (ia || dhcpv6_opt(&data, OPT_IA_TA)) return -1; info("DHCPv6: received INFORMATION_REQUEST, sending REPLY"); @@ -619,7 +615,8 @@ int dhcpv6(struct ctx *c, const struct pool *p, n = offsetof(struct resp_t, client_id) + sizeof(struct opt_hdr) + ntohs(client_id->l); n = dhcpv6_dns_fill(c, (char *)&resp, n); - n = dhcpv6_client_fqdn_fill(p, c, (char *)&resp, n); + packet_base(p, 0, &data); + n = dhcpv6_client_fqdn_fill(&data, c, (char *)&resp, n); resp.hdr.xid = mh->xid; -- 2.49.0