From nobody Sat Sep 27 15:13:54 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 4cYrZW2FFSz68D8x; Sat, 27 Sep 2025 15:13:55 +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 4cYrZW0VTwz444h; Sat, 27 Sep 2025 15:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758986035; 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=BVCMyuZ+UA3AWzxZALlTtM5DkgZUpes0ty97zRfaIJM=; b=MO4SPwbIYM0azs2KJB5AASgWjw7JUFIg/qAZlkwc6zrBDARmxAam0FF1tTr+XLT7JUvL4a ++SC/lsNNgnramw7k3Fow+uEYhlEF6aTEXtd5WGP/AAoyJxwiOHM9IyustdVZGvWBQCSD4 9e7PvxGhYNj6rIRyb+q5sGJx6WTYvuZYVLJzgEJlDzC2/miLWYjyafiCK/wVfkDRoEEMGM wVsOTqICa7/rsQY1ZRb7bLld5G69+h/tBAlRy5t8ZZurjRUMqfZB2uEtAlU5NFem9Y3n5F Clk9U7zTMn+BD1KZsaYyWbUGUoAZ7FZo6mQxpdv+VguSeQxBE8RBAQgqwGEL8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758986035; 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=BVCMyuZ+UA3AWzxZALlTtM5DkgZUpes0ty97zRfaIJM=; b=gbjo1MvMxu8YMhlIE29u024FHe9uhOyHVX/Ne2KT7SRuq6VjtlDGINcPBVNgCerGYzCTOV rTWkw/GoyqX6fMZfCNb3+f7Zzf4TRQnWHsrBab5Qbna5hPU5HGvAH6FdEfQJs+dmmrXE20 JzZA0WCnN3WE/4QoRY8wZ7EpyhkiQSZwMWggBJ5bO72/FKkl/BPzrqYdM0ih0WhFVbDc9Q tQPLCXPYlNTVGv06qyoe6eMMf8/EeR/30sCOmE47NAIejQOt7wMI9M72HZjZ+75LgnddQL +794qcjtzDFMVc7d2hr9PCPjlrymHKdslznJPsw73oYMAjkSSfiuW6+OcHjDEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758986035; a=rsa-sha256; cv=none; b=i4iqdqkRArTnk4RWFK9nhOq6P43y7m0hV3k03Jr3gpTuhtJH3A0/3v9Tjdj0Y7f7j8USNK Am5l83P+X9d8+ZGFXR1YagdrgXVAgKSJ2S6OPkaAy7P4xslyBd8kg6ihPUOsbDAmcjdgKP 03OeNBEbU3YJT+wn+cRX4Hd2C1PByw6wKshlaWGrWfzGWWdbTEJw+Con95CFB4wGNZAiwX BSpWNpr7KUj3t6X3Q7VKSgcjXLwbJCdNIUPHPxKWzEh+s5Zvr+3o2asDtvo489toWoCIWt 5/C5JYavHTZxML9WtjAthiIlyTMfiXEhNPYqsjcAW0UvUMujpXZhk1tmmmRaFw== 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 4cYrZV74DczfWM; Sat, 27 Sep 2025 15:13:54 +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 58RFDseQ083060; Sat, 27 Sep 2025 15:13:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58RFDst3083057; Sat, 27 Sep 2025 15:13:54 GMT (envelope-from git) Date: Sat, 27 Sep 2025 15:13:54 GMT Message-Id: <202509271513.58RFDst3083057@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: b4c6c3db0379 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: b4c6c3db0379a5b3d34143325805cd7e68cf3d9a Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=b4c6c3db0379a5b3d34143325805cd7e68cf3d9a commit b4c6c3db0379a5b3d34143325805cd7e68cf3d9a Author: Zhenlei Huang AuthorDate: 2025-09-16 15:58:24 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-27 15:11:35 +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) --- 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 0e0ecd3c6b20..928ccefe4803 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 @@ -1717,6 +1718,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;