From nobody Sat Oct 9 21:19:26 2021
X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7F08117EE6ED;
Sat, 9 Oct 2021 21:19:26 +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 4HRdH236MKz4jxK;
Sat, 9 Oct 2021 21:19:26 +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 4B18D2182F;
Sat, 9 Oct 2021 21:19:26 +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 199LJQJm031468;
Sat, 9 Oct 2021 21:19:26 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 199LJQoW031467;
Sat, 9 Oct 2021 21:19:26 GMT
(envelope-from git)
Date: Sat, 9 Oct 2021 21:19:26 GMT
Message-Id: <202110092119.199LJQoW031467@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Vincenzo Maffione <vmaffione@FreeBSD.org>
Subject: git: fdbbd118faab - stable/13 - nemtap: lb app: Validate ihl field when hashing packet
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
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/stable/13
X-Git-Reftype: branch
X-Git-Commit: fdbbd118faab9705bd28475b182ca0ab5585da8e
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by vmaffione:
URL: https://cgit.FreeBSD.org/src/commit/?id=fdbbd118faab9705bd28475b182ca0ab5585da8e
commit fdbbd118faab9705bd28475b182ca0ab5585da8e
Author: Vincenzo Maffione <vmaffione@FreeBSD.org>
AuthorDate: 2021-09-26 13:44:51 +0000
Commit: Vincenzo Maffione <vmaffione@FreeBSD.org>
CommitDate: 2021-10-09 21:19:20 +0000
nemtap: lb app: Validate ihl field when hashing packet
MFC after: 1 week
(cherry picked from commit f7cef43aa9a357582a703c75dafa4a44c1b2f28c)
---
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,