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=dZZT1Z2A; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by passt.top (Postfix) with ESMTPS id C7E4C5A0272 for ; Tue, 15 Apr 2025 11:43:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744710218; 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=LzOzB0YaaW7Yktungpwpo2+HwzOT3bVGkKz/TeEYAkY=; b=dZZT1Z2A4yszQIV9hvy99wgB2TBrNEz/CW0I79Dopzb8xjxvJDfka9MHWj2pzXPTqFmxh2 HKI8Dfrw87dJ+1zDsB3y8OvgMfCZauMxXvih0RUoFKjM+TW+hYISNuubTK51kmSiHb0VYV Ibh7SXIERGHZ2K2660gakbVNulFQ1So= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-360-k0B7fjdGPoGzRDBcOqZvBw-1; Tue, 15 Apr 2025 05:43:34 -0400 X-MC-Unique: k0B7fjdGPoGzRDBcOqZvBw-1 X-Mimecast-MFC-AGG-ID: k0B7fjdGPoGzRDBcOqZvBw_1744710213 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5508E18009B1; Tue, 15 Apr 2025 09:43:32 +0000 (UTC) Received: from lenovo-t14s.redhat.com (unknown [10.44.32.6]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 71F911809BEA; Tue, 15 Apr 2025 09:43:30 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH v3 15/20] dhcpv6: Convert to iov_tail Date: Tue, 15 Apr 2025 11:42:55 +0200 Message-ID: <20250415094300.65794-16-lvivier@redhat.com> In-Reply-To: <20250415094300.65794-1-lvivier@redhat.com> References: <20250415094300.65794-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: OyGPIfwhsfjt-BgE1JsP4VNlZhJ_Y_U2uN7EILnvSrg_1744710213 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: PLP273T26H5YP2ES4ZQUQGDP77WYSWNQ X-Message-ID-Hash: PLP273T26H5YP2ES4ZQUQGDP77WYSWNQ 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 , David Gibson 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: Use packet_data() and extract headers using IOV_REMOVE_HEADER() and IOV_PEEK_HEADER() rather than packet_get(). Signed-off-by: Laurent Vivier Reviewed-by: David Gibson --- dhcpv6.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dhcpv6.c b/dhcpv6.c index 549ddbbea735..a52af1b7a0fe 100644 --- a/dhcpv6.c +++ b/dhcpv6.c @@ -534,9 +534,15 @@ int dhcpv6(struct ctx *c, const struct pool *p, const struct msg_hdr *mh; const struct udphdr *uh; struct opt_hdr *bad_ia; + struct iov_tail data; + struct msg_hdr mhc; + struct udphdr uhc; size_t mlen, n; - uh = packet_get(p, 0, 0, sizeof(*uh), &mlen); + if (!packet_data(p, 0, &data)) + return -1; + + uh = IOV_REMOVE_HEADER(&data, uhc); if (!uh) return -1; @@ -549,6 +555,7 @@ int dhcpv6(struct ctx *c, const struct pool *p, if (!IN6_IS_ADDR_MULTICAST(daddr)) return -1; + mlen = iov_tail_size(&data); if (mlen + sizeof(*uh) != ntohs(uh->len) || mlen < sizeof(*mh)) return -1; @@ -556,7 +563,7 @@ int dhcpv6(struct ctx *c, const struct pool *p, src = &c->ip6.our_tap_ll; - mh = packet_get(p, 0, sizeof(*uh), sizeof(*mh), NULL); + mh = IOV_PEEK_HEADER(&data, mhc); if (!mh) return -1; -- 2.49.0