From nobody Sat Oct 4 16:44:33 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 4cfBFt0HsKz69JbZ; Sat, 04 Oct 2025 16:44:34 +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 4cfBFs4gV3z3KpG; Sat, 04 Oct 2025 16:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759596273; 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=F8XGuGEpvgFCCH9H5gtyIhB2DiL2a+AoBK8KYT5TAMQ=; b=tth+lR8ZB4jiE2vrTIvYG0l5ay+r3kAfCP/BNzgzRHarlZmwRfLay/Mn0KFh3kQ8FCRW+t EQ1TmVTRM5uAg4Uw0nNzh8ubj6BgbQx4LXD5XhvlpsTw9WgqHKVN+DY00kTI804sCPfGxl kY4SGhAb+ti9lFZoUIhxTKllsCZVpMk1sN04Qi8FY4sQKu6mg2lEVmZHsn2q+E3UbM49Fw n/G1eWWeadIUI76hJ96rpj7tdd9bMShEqDgcEDKp5w15k3MWsa+NXB3umRWEbK0R3HQtQZ kvTD7AnCKAIVZUI/S0k/lFp2Yz41bstTF8ShoUoWUdgUtri6LVuPXWEHXhiaxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759596273; 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=F8XGuGEpvgFCCH9H5gtyIhB2DiL2a+AoBK8KYT5TAMQ=; b=SgjLfegOpe+aSQ5SSsPOlH+br/VxuMegmrDG73iFtFTf0FKqiS2shf1QxKfJi/Epy7fO6n zH+2lt/IS7AsaDvkNCy5Rl6VAJVqI5m1uwcQv2IY2mFRVw0zOsNe/2bSLdKRNekKlmKGRj wPGh2RBqpW4K00iIl06Jxi499p/SEeQS5gyXhzgii30/DsZsf3tzTnfb4Y1vfQruiuZ4I0 ux4ieIzUS0MAsRN3ulx8HqR8bSUXGXcKkEnZ0VppnRegwmTwXmnjh1cyIBHdTmWeq/ZkwO GvjN4vb+wdPhCU0ngPR/y1uubR9KTz1annHCh1bBIlVDe6bRhmJ+iOl5Vs509A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759596273; a=rsa-sha256; cv=none; b=vCVM9Rb8o+1xi2+sf+jQQA+9uGGWr+qJtt73X1bntkIV542DguSO83q+qArXVNtddg4prh rq7R3H34zj8MYZ7fxCePalhq5TK2ihefyOkxCcw6dOc7xYvfakgvyZffc4vHs1oKxZxVQ7 aSNgAwsWRw38szcOQ1Kj1SfqhrWz7SgYVxzHOE2tNi5gUIPpFuM072BrefaxLzTTZRWNVV hYeWNatp0PgxevCVzAejsjlb5+eJ7h63e9Jb9v/LXHMoRkyzfNvw6748rITnHxUKMUEUuH gH7nFj1QoT4RNa+kyDR9fTplbJ7uZns/QnHDgScXC3vjmkvpdvXCaacZhJK3Eg== 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 4cfBFs3mN9zqdP; Sat, 04 Oct 2025 16:44:33 +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 594GiXt9058073; Sat, 4 Oct 2025 16:44:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 594GiXip058070; Sat, 4 Oct 2025 16:44:33 GMT (envelope-from git) Date: Sat, 4 Oct 2025 16:44:33 GMT Message-Id: <202510041644.594GiXip058070@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 1a9f9b4e38c3 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 1a9f9b4e38c370eb505554edba6041542b8ba701 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=1a9f9b4e38c370eb505554edba6041542b8ba701 commit 1a9f9b4e38c370eb505554edba6041542b8ba701 Author: Zhenlei Huang AuthorDate: 2025-09-16 15:58:24 +0000 Commit: Zhenlei Huang CommitDate: 2025-10-04 16:43:21 +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 (cherry picked from commit 0418e6690e91aa6c38dd9af9da43c4c5a9dc1cd2) (cherry picked from commit b1c96e54b906d0cdea0b5a9c74cc295803dfe50e) (cherry picked from commit b4c6c3db0379a5b3d34143325805cd7e68cf3d9a) --- 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 2e306d9e291c..efcb269a4831 100644 --- a/sys/netpfil/ipfw/ip_fw2.c +++ b/sys/netpfil/ipfw/ip_fw2.c @@ -66,6 +66,7 @@ #include #include #include +#include #include @@ -1702,6 +1703,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; + default: if (V_fw_verbose) printf("IPFW2: IPV6 - Unknown "