From owner-dev-commits-src-all@freebsd.org Sun Sep 26 13:48:29 2021
Return-Path: <owner-dev-commits-src-all@freebsd.org>
Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1D1C767954C;
Sun, 26 Sep 2021 13:48:29 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4HHRtj0Df4z4RGV;
Sun, 26 Sep 2021 13:48:29 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D917A1E958;
Sun, 26 Sep 2021 13:48:28 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18QDmSgC035744;
Sun, 26 Sep 2021 13:48:28 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18QDmSgX035743;
Sun, 26 Sep 2021 13:48:28 GMT (envelope-from git)
Date: Sun, 26 Sep 2021 13:48:28 GMT
Message-Id: <202109261348.18QDmSgX035743@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Vincenzo Maffione <vmaffione@FreeBSD.org>
Subject: git: f7cef43aa9a3 - main - nemtap: lb app: Validate ihl field when
hashing packet
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: vmaffione
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: f7cef43aa9a357582a703c75dafa4a44c1b2f28c
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for all branches of the src repository
<dev-commits-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-all>,
<mailto:dev-commits-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-all/>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Help: <mailto:dev-commits-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all>,
<mailto:dev-commits-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Sep 2021 13:48:29 -0000
The branch main has been updated by vmaffione:
URL: https://cgit.FreeBSD.org/src/commit/?id=f7cef43aa9a357582a703c75dafa4a44c1b2f28c
commit f7cef43aa9a357582a703c75dafa4a44c1b2f28c
Author: Vincenzo Maffione <vmaffione@FreeBSD.org>
AuthorDate: 2021-09-26 13:44:51 +0000
Commit: Vincenzo Maffione <vmaffione@FreeBSD.org>
CommitDate: 2021-09-26 13:48:21 +0000
nemtap: lb app: Validate ihl field when hashing packet
MFC after: 1 week
---
tools/tools/netmap/pkt_hash.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/tools/netmap/pkt_hash.c b/tools/tools/netmap/pkt_hash.c
index 3071935e11ef..eb9704fd2058 100644
--- a/tools/tools/netmap/pkt_hash.c
+++ b/tools/tools/netmap/pkt_hash.c
@@ -150,7 +150,9 @@ decode_ip_n_hash(const struct ip *iph, uint8_t hash_split, uint8_t seed)
{
uint32_t rc = 0;
- if (hash_split == 2) {
+ if (iph->ip_hl < 5 || iph->ip_hl * 4 > iph->ip_len) {
+ rc = 0;
+ } else if (hash_split == 2) {
rc = sym_hash_fn(ntohl(iph->ip_src.s_addr),
ntohl(iph->ip_dst.s_addr),
ntohs(0xFFFD) + seed,