From nobody Sat Sep 27 18:35:48 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 4cYx3f08jKz68VDL; Sat, 27 Sep 2025 18:35:58 +0000 (UTC) (envelope-from chmeee@has.gonegalt.net) Received: from mail.gonegalt.net (mail.gonegalt.net [208.167.253.104]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4cYx3d3Tgvz3S8b; Sat, 27 Sep 2025 18:35:57 +0000 (UTC) (envelope-from chmeee@has.gonegalt.net) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gonegalt.net; s=dkim; t=1758998150; 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: in-reply-to:in-reply-to:references:references; bh=16nTrGCoEivZxb7MtDoqjwSCasfNeWfI4Z4wyHZkt3M=; b=dF85QuiuUam4T934i33ZiV/7nwxX27nC1ThCE1Z1MMkMO103b02pu267o1/RwAYBWealvK AZZuhEXP3uX9XjosLO2GZQHmh39z+q8qlYpvaYa7ThTjLUoAbKuaVCip1EAhGMWp+C5+78 /bL/kYkmN94ko3J6tQdhWiWM1dA1GmE= Received: by localhost (OpenSMTPD) with ESMTP id b598bd7b; Sat, 27 Sep 2025 14:35:50 -0400 (EDT) Received: from ralga.knownspace ([2600:2b00:a720:d301:9f03:382a:d672:81f0]) by mail.gonegalt.net with ESMTPSA id DVsOMIUu2Gg+OAAA0J78UA (envelope-from ); Sat, 27 Sep 2025 14:35:49 -0400 Date: Sat, 27 Sep 2025 14:35:48 -0400 From: Justin Hibbits To: Michael Tuexen Cc: Zhenlei Huang , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" Subject: Re: git: b4c6c3db0379 - stable/14 - ipfw: Teach ipfw that EtherIP is an upper layer protocol Message-ID: <20250927143548.661e75f7@ralga.knownspace> In-Reply-To: <44DAB9B2-B037-49B0-9153-90B4CFBB6234@FreeBSD.org> References: <202509271513.58RFDst3083057@gitrepo.freebsd.org> <44DAB9B2-B037-49B0-9153-90B4CFBB6234@FreeBSD.org> X-Mailer: Claws Mail 4.3.1 (GTK 3.24.50; powerpc64le-unknown-linux-gnu) 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=US-ASCII Content-Transfer-Encoding: 7bit X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cYx3d3Tgvz3S8b On Sat, 27 Sep 2025 20:32:20 +0200 Michael Tuexen wrote: > > On 27. Sep 2025, at 17:13, Zhenlei Huang wrote: > > > > 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) > Why is this cherry picked from two commits? Shouldn't this be only > cherry picked from the commit to the main branch? > > Best regards > Michael It's common to cherry-pick from stable to older-stable. This was likely cherry-picked from stable/15, which was cherry-picked from main. - Justin > > --- > > 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; >