From nobody Fri Oct 30 17:50:49 2026 X-Original-To: dev-commits-src-all@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 4jGTCs4Vfyz6xHLG for ; Fri, 30 Oct 2026 17:50:49 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jGTCs2wXZz4kPK for ; Fri, 30 Oct 2026 17:50:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793382649; 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=3eBqwY+GzDtcovLihg07HJLQLTzsgTH3MIEYD5CCX1w=; b=UEPnwRTgyE1RzxgGCtKHzai5U0DZljpRi1BCbIDthOJbwzbd5G0z9RC9ISOl0BivxQrFbw DqxyBg+oiI3M4kux/pj8R+e+TcaM7tu3bFkKtOBikQkXOsh/V8n6FZv2zvm6GjgO8zYgLR KvzlI5vXDCoVgU62iYG29dOQxBr1C/jJecO/AmxHe2HacgriajoxXwWGTMj2/KJdOP+Doa NXj2AVPCe0NHtq+wiWkUXo8e+UGsVmj+IgcfHqVBAutGVj4JkVmUPWMVW0Z/ojEAO7SVYq yePNwvJ6iO28crXqRUSIBRCsrWF3wHYmn49qkwteMdItWwTu03cOnt15ddOfvw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793382649; b=qGV8oIjpyInVWBm/G4ODDZXtubZlCdRCLq309N1HRHmKds6Bv6uHywJoreqOisN/MaYYsD 9IN/HLvytKudUBejFoyY0G9E1OPt0vR9C4tPPveGagybcLq/evRCPLyvFFs8RsAr17yeim x7nLr9Menpae4OO00m2QDMrlWSacuJasAR4tKCAK/wSNHphu0sQ3JErutCZqQUsfKUORGv AgTm0FAhp3QqVQ6v+VEC0zpTwOiU6Krk0EdiXY2w/ijQV+tpzjaHscQsm6n0eUxXjQbAa5 5IZQPlbEEBfHQdkvgio00LcOj2MpQemaD9lmS05k25CjyUaAPj0W37b5STVqaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793382649; 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=3eBqwY+GzDtcovLihg07HJLQLTzsgTH3MIEYD5CCX1w=; b=tO9X01jc2HSBJ+OIYF+y77CMQCVX+nYcRAdkeMExV7MthrrFLHOcNs90LbxZUD4gOV2LkQ ymGP1xD+DIvSDp9dDkyvSK1Gt5u8EKbz/PAmA1VfuEs4iOrq+kaTUXkYQoJi1vCRWUn7kZ 9HV4kx9QE7DkUj/nyG9mVXTKnBUjUyDtz9je2xBf/jI/Mb1nCdfAWIucGuE7v7KkuvZatH ATDmRt4xpKagN9sCwV1XZF8Bj5Fnip24S83f8LQs2BnqNX2agUAvVok8noHSYWKrQ37QKU O/fj179foIbakCCvYvQEKGT8TQl1t0xZBiZiHApdPS3axbCpJgOEq6cEU8MyMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jGTCs27Lrzdxp for ; Fri, 30 Oct 2026 17:50:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4124b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 30 Oct 2026 17:50:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Teddy Engel From: Kevin Bowling Subject: git: 221d978bccda - stable/15 - ipfw/nat64: Fix type confusion panic when using wrong NAT64 instance type List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 221d978bccda79a0acf6425551b9ec3592e1b76e Auto-Submitted: auto-generated Date: Fri, 30 Oct 2026 17:50:49 +0000 Message-Id: <6ae4d8f9.4124b.12a69132@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=221d978bccda79a0acf6425551b9ec3592e1b76e commit 221d978bccda79a0acf6425551b9ec3592e1b76e Author: Teddy Engel AuthorDate: 2026-06-02 16:24:57 +0000 Commit: Kevin Bowling CommitDate: 2026-10-30 17:50:38 +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 (cherry picked from commit 2e6b22abf44d99b84abf17fe25ca2e8f89716c04) --- 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 d524652e9a99..4b88c0695813 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 ad1f2b3ec378..c188548549aa 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) {