From nobody Mon Jun 22 22:15:46 2026 X-Original-To: dev-commits-src-main@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 4gkjFh1qzWz6j8f4 for ; Mon, 22 Jun 2026 22:15:52 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkjFh1Kw3z3T1r for ; Mon, 22 Jun 2026 22:15:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782166552; 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; bh=FA7Z8AnoLg4RjYrCTyKwKxm+qDKvRpy0azbo6b9WPAE=; b=lch7SqCzUgtJiZOAdWxRN0r29FQNueDdk7R/uHvZYmerQHh+GiAObD8wQyqIBXS2tS7SAc b039QcoYOVAfYL3Tl+GCRkghuT/gtG6j28YlK8CmHMMh6Yhg2C/qVrl04H33dHs+Kg2tLd Ad34GUcXUunK7MqS0PtKho3KJIqco+Wg4ynOwnwZVtonDlySXwl1ZpNYlwsR+OncN3sT34 afhncpA7nPm+A5SvsNSjvqyczSBrdnK1d8ve8ilbpkPpcz8ixQMHPPrAGRUqoGVuIfhxFB 5KwOpvWwIc0R7RcicHQ3g+LrzEJtS/v+AHNIHizixShgtcHePthctSr/HqucnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782166552; a=rsa-sha256; cv=none; b=Bfgt+AV0l7+RMXe/G3sL2oY5abjRImrHgu4A/cnoqqAqPq90aQUpb0unVfGcLRvcsIyPQh 1HQV7pK0He3dNUPSI3aB4mniQCBG5QbJH7zr6S754IPbW/z2nkz0bzY2bCxd70wBiYJrV6 VvnT+Ae/pQDozpV3DL8PY2V3UiyjJtCdQ8o4tu/hLjcIknTnOd8Dk2Fgx0SrOeB53+Zl42 O5RwOp+LAh+etjeN6LcEnYrMDAJgpbU8L2ONcT4Nz26D77DhnAe9sS/aqZ467BH3VHUoLF BBQ7ShM0tK+/FrUb0NAX8xZExL+ZhEZDbOhbxd8azm4xmhtyWGZih9Vw4ZT0kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782166552; 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; bh=FA7Z8AnoLg4RjYrCTyKwKxm+qDKvRpy0azbo6b9WPAE=; b=BNNHEo2NCGcUUHpROCcCaWujN3OqKbx+ObXtiP7uQMXnBq3I1cUloNpvF/jfbVFxu2Zg+Y AtTLqnACx5y1YPvJ2exQovzeQ7Uh+vRvrWA4xPGj6f+eAKG40O6KZb3e7BQe7UW1tDHrQ3 0xY4fG2OCeCQrI/Pc3R89TvV+WJzI9oc4WqgdmkdfbVOyZyt5gmkWJHFqMctHENdI4jeRO WJayQRLQeAkMVBH844Kx3Zg3uestHcjKT7J4WtoI2O0fYv+YOrefJuVD/atJ9xnaZpoh9M p0WCyDf7OPU7bFNzHJUIP8jV5kaUW1uMWF/zVuGI5MLWanUBBIpwkSkt+pcWWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkjFh0Bssz15wg for ; Mon, 22 Jun 2026 22:15:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 222b8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 22:15:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Teddy Engel From: Pouria Mousavizadeh Tehrani Subject: git: 2e6b22abf44d - main - ipfw/nat64: Fix type confusion panic when using wrong NAT64 instance type List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e6b22abf44d99b84abf17fe25ca2e8f89716c04 Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 22:15:46 +0000 Message-Id: <6a39b412.222b8.4f738eb7@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=2e6b22abf44d99b84abf17fe25ca2e8f89716c04 commit 2e6b22abf44d99b84abf17fe25ca2e8f89716c04 Author: Teddy Engel AuthorDate: 2026-06-02 16:24:57 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-06-22 22:15:36 +0000 ipfw/nat64: Fix type confusion panic when using wrong NAT64 instance type Add etlv type validation to ipfw_nat64clat() and ipfw_nat64stl() to verify that the retrieved instance is actually a nat64clat instance before use. All NAT64 instance types share the same srvstate[] array but have different struct layouts. Without type validation, using the wrong instance type with a handler causes type confusion and kernel panic. Signed-off-by: Teddy Engel PR: 292023 Reviewed by: pouria Pull Request: https://github.com/freebsd/freebsd-src/pull/2259 --- sys/netpfil/ipfw/nat64/nat64clat.c | 3 ++- sys/netpfil/ipfw/nat64/nat64stl.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/ipfw/nat64/nat64clat.c b/sys/netpfil/ipfw/nat64/nat64clat.c index c458f85755d3..15d052549792 100644 --- a/sys/netpfil/ipfw/nat64/nat64clat.c +++ b/sys/netpfil/ipfw/nat64/nat64clat.c @@ -214,7 +214,8 @@ ipfw_nat64clat(struct ip_fw_chain *chain, struct ip_fw_args *args, if (cmd->opcode != O_EXTERNAL_ACTION || insntod(cmd, kidx)->kidx != V_nat64clat_eid || icmd->opcode != O_EXTERNAL_INSTANCE || - (cfg = NAT64_LOOKUP(chain, icmd)) == NULL) + (cfg = NAT64_LOOKUP(chain, icmd)) == NULL || + cfg->no.etlv != IPFW_TLV_NAT64CLAT_NAME) return (0); switch (args->f_id.addr_type) { diff --git a/sys/netpfil/ipfw/nat64/nat64stl.c b/sys/netpfil/ipfw/nat64/nat64stl.c index c1ca2dfd5e13..305ba1e9e8dc 100644 --- a/sys/netpfil/ipfw/nat64/nat64stl.c +++ b/sys/netpfil/ipfw/nat64/nat64stl.c @@ -217,7 +217,8 @@ ipfw_nat64stl(struct ip_fw_chain *chain, struct ip_fw_args *args, if (cmd->opcode != O_EXTERNAL_ACTION || insntod(cmd, kidx)->kidx != V_nat64stl_eid || icmd->opcode != O_EXTERNAL_INSTANCE || - (cfg = NAT64_LOOKUP(chain, icmd)) == NULL) + (cfg = NAT64_LOOKUP(chain, icmd)) == NULL || + cfg->no.etlv != IPFW_TLV_NAT64STL_NAME) return (0); switch (args->f_id.addr_type) {