From nobody Tue Sep 16 16:00:29 2025 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 4cR67K2zCbz67Vgj; Tue, 16 Sep 2025 16:00: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR67K20Bnz3thD; Tue, 16 Sep 2025 16:00:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758038429; 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; bh=enO+HFjDzBwDMPW9t0DZGuWWwUgIyKRR7Nd/OjL3vAU=; b=DFl21TVMGtCmB6bXnAx7WoqSJ9vPAVx/Y/bVaAg+ZXMtB2t7o2j1NA3v6jTaUV7RUrVBsG vAgLK+2BrkUDzaFH4u9dbq+TX28GR8jhQhZ2qgyGga5IMPZkiJ+1WIr/9fL6YyVDHfeM8y dhoPcvXAytX1facE/dAqWWQ/CsZOXZhteWlEGE5Oaq6NrqWmgrdRqJJPho6Zp8uHpOkpiM ojlgsagYF2h0AQebW0q75nfcw8TmlW85YkweFsBVk5IomMKZOGEKPKjCVV9ENafA/QLSWl aY0E988esPa9++VguWlBalPDDDz9OtLQy5PUktEDKKveqMyVOyRp96sh5VwrYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758038429; 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; bh=enO+HFjDzBwDMPW9t0DZGuWWwUgIyKRR7Nd/OjL3vAU=; b=r+Bx1kkRfXcYycth68F0wcf89Yo7HEnShBzJ+fJURYhFzYux6jRRgsW+TGX3UG+QTBFYG8 FiAdfSn3h414fWNZG0IwBtNyR+ixT1qzaBD346aDfx4hoh7aHseaGLvJ2MlBh1BGEJ31p/ cvA9BQz6CkmcO3aouWreLMW7kjUvpqLQ2Tg/vDQ9X9FbG0lRqnycYXJDw2mMKGMAn538jX ywQEZEsEoMGno0QK7ZNuT/07rmEXAfiSSCMSq78pG0n+0QtsS9f18a3/jYLSLhIS99vFSw Yg0VRqUKqV/uaoiARZzz2Hlf7nY3zM5uSguakMrQTAc3+/xW4/oX8WHDTj8Abg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758038429; a=rsa-sha256; cv=none; b=inZLPF6GfDLfoUVACJZWF1+jPDH7eQNtZBkbFoXPVw0LDzvx9zNWIypUT/2i1svn7GX/Ou gAPaaJKUmI2SC3OvizL3QQdneR+9Zzd6ME3j6BoNRwELXjiLegpuqwr5DRuRTwCYA4SNCd DGr+dm++smoDDw2qDN5pQt/k4XCxc8X0YSsA4ohaCGQC/2djHMkqUe9W19rdekCcLPLyfm jhGcoMz6GCYmMCZP28zLgzk1RQ35sEAY0gOoFSH0v6Qa1yK8BQbNtrc/QkFURI8Ga9ABId Dsni3phlWj5Im0Burq9aBhLDttmY7c3tMIRrmW89zv6wJi9fhKKpFcMkZVJpzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR67K1WMgznRJ; Tue, 16 Sep 2025 16:00:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GG0TEs001386; Tue, 16 Sep 2025 16:00:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GG0T4R001383; Tue, 16 Sep 2025 16:00:29 GMT (envelope-from git) Date: Tue, 16 Sep 2025 16:00:29 GMT Message-Id: <202509161600.58GG0T4R001383@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 0418e6690e91 - main - ipfw: Teach ipfw that EtherIP is an upper layer protocol List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0418e6690e91aa6c38dd9af9da43c4c5a9dc1cd2 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0418e6690e91aa6c38dd9af9da43c4c5a9dc1cd2 commit 0418e6690e91aa6c38dd9af9da43c4c5a9dc1cd2 Author: Zhenlei Huang AuthorDate: 2025-09-16 15:58:24 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-16 15:58:24 +0000 ipfw: Teach ipfw that EtherIP is an upper layer protocol so that we do not discard EtherIP packets ( over IPv6 network ) when net.inet6.ip6.fw.deny_unknown_exthdrs is set to 1 ( which is the default value ). PR: 227450 Reviewed by: ae, #network MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52566 --- sys/netpfil/ipfw/ip_fw2.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/netpfil/ipfw/ip_fw2.c b/sys/netpfil/ipfw/ip_fw2.c index 3f810533b7fc..b59d8d08bf80 100644 --- a/sys/netpfil/ipfw/ip_fw2.c +++ b/sys/netpfil/ipfw/ip_fw2.c @@ -67,6 +67,7 @@ #include #include #include +#include #include #include @@ -1757,6 +1758,12 @@ do { \ PULLUP_TO(hlen, ulp, struct ip); break; + case IPPROTO_ETHERIP: /* RFC 3378 */ + PULLUP_LEN(hlen, ulp, + sizeof(struct etherip_header) + + sizeof(struct ether_header)); + break; + case IPPROTO_PFSYNC: PULLUP_TO(hlen, ulp, struct pfsync_header); break;