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=Nni2JVNM; 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 9D3735A0274 for ; Thu, 09 Jul 2026 00:32:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1783549933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8MgJcqsesGW6VJSYJvLUu6vAeGQ1tRjSLnGJWxTP4K4=; b=Nni2JVNMHFpnBOhzhQDRg2gHSl6d2bLI0n9zc2Vdq8SCHrXrssPg53jRB57KbDz/nP/2Jj Fpx/jc2p4y+9E+QDFcV5fhK8AE9mF2QlqK/X+2Yk9c9URFylMI0UuzYWHn2YauF1NddAIR 2ecSfgZw+MLQekOZPWRo7X8FiNeRlmU= 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-648-5XpVUsE3NGiyv0e_hfTZfA-1; Wed, 08 Jul 2026 18:32:10 -0400 X-MC-Unique: 5XpVUsE3NGiyv0e_hfTZfA-1 X-Mimecast-MFC-AGG-ID: 5XpVUsE3NGiyv0e_hfTZfA_1783549929 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 6A8131955F11; Wed, 8 Jul 2026 22:32:09 +0000 (UTC) Received: from jmaloy-thinkpadp16vgen1.rmtcaqc.csb (unknown [10.22.88.44]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 46D9C1955F75; Wed, 8 Jul 2026 22:32:08 +0000 (UTC) From: Jon Maloy To: sbrivio@redhat.com, david@gibson.dropbear.id.au, jmaloy@redhat.com, passt-dev@passt.top Subject: [PATCH 3/7] tap: Assert IPv6 tail size before subtracting header length Date: Wed, 8 Jul 2026 18:31:59 -0400 Message-ID: <20260708223203.885345-4-jmaloy@redhat.com> In-Reply-To: <20260708223203.885345-1-jmaloy@redhat.com> References: <20260708223203.885345-1-jmaloy@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: NwxG6K4RZCbJK66XgSnxkEwljm5u6gWkrOxrwZj37DU_1783549929 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: HY7XD5BGUXKMFFWHB3ILX42RE23IMBIL X-Message-ID-Hash: HY7XD5BGUXKMFFWHB3ILX42RE23IMBIL X-MailFrom: jmaloy@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 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: In tap6_handler(), iov_tail_size(&data) - sizeof(*ip6h) is used to compute the expected payload length. The subtraction is safe because IOV_PEEK_HEADER() already verified that the tail contains at least sizeof(*ip6h) bytes, but add an assert to make the invariant explicit. Signed-off-by: Jon Maloy --- tap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tap.c b/tap.c index 6d93c7ce..d0d5148e 100644 --- a/tap.c +++ b/tap.c @@ -986,7 +986,9 @@ resume: if (!ip6h) continue; - check = iov_tail_size(&data) - sizeof(*ip6h); + check = iov_tail_size(&data); + assert(check >= sizeof(*ip6h)); + check -= sizeof(*ip6h); saddr = &ip6h->saddr; daddr = &ip6h->daddr; -- 2.52.0