From nobody Sat Sep 27 21:47:40 2025 X-Original-To: dev-commits-src-branches@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 4cZ1Jx29gQz68lXG; Sat, 27 Sep 2025 21:47:45 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cZ1Jx1bzQz3nCw; Sat, 27 Sep 2025 21:47:45 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759009665; 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=laahTYb+khXux2ASyodziiQ2mqKb38LgABFqVp0ip+I=; b=t+INNcnmyULIz8rDC7nGjrI4HYqMRPU5h7/EoQ4s6yz43m7AyUjYrJaX0/Tdxbj8ov+inQ fuNW29i6HGRta77rOBMQ61tayAFPImoOzTpFLb8V8v6J1kaCqSAwTLj0o2iAGw4yLP7NEk cdUDqtYlumJ3EyFZZgbRxNKvaGqIh4496LWjmjfuJtbmmOc5iKTmTa4OcMu6YqMSZT0nY2 vY6aUxBVGye1HV2rcZ+tO7Codce6EL6F4iGuD3bsFGzjPYvyBAeGQYsOZU2z1NVuUSIoJ8 Hi0thseprMKLS9dM56kk+IWgwzmWXWpQU6kli+tJRQFS7snkdAnwmEIGJvIOXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759009665; 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=laahTYb+khXux2ASyodziiQ2mqKb38LgABFqVp0ip+I=; b=EuZIfuwLhOfhYcfDcbMud+u8BCOHV/coYSIZZE8ZBdiYWkHalScpEFOOUxljxJFTZXsgAN jF6KXZRVG5OeqUqmgCCCFTcYasx94u2EDEgzw036efgc5ArAx0pQu5AZYH4SXipI3fMbCR dKZnMqG2Z1Nd3U8xUULNtY3AyhTXznZ+4YKGJ5Ch9Qp9mSQGCHvoeAK7m1xzzoM7+9mSgY rLSAqU0NBwsqcwGAai42zVTzJvj78VrEXn+k028XqmIO8rpUGu5S2DFZ/ytPWdn3efgP2m EycKnSwxkIuoFyaqm1ae0bk7o9yVvNP5EsNlq8joyI7ilP6VfZ2V0ls1Mo0yNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759009665; a=rsa-sha256; cv=none; b=PJr4QTjPBB84yOGE8u10xSWWINdgwXlxcSr2u7KtaO9H/f1z63c1Rm7cTlci4y9JbIx2nR VbJlpLre5Salm4m1VGZ+E00xzXYwX7aXz1UdNYuN0OcZF58hKWqKbgtDOFx9xxSC/ZLrXq BmQZENWXoBALZ5K140OJHNmVgOGCVVxXEHPxq+CuYfcGEgAOLxLnzlKee09+FnL9kmOCtC +CGuUf0lNsXQ/4i2Fb5YhrMqIixVBr1pMmhaheGUF1YM94cXIinXdwKHyJ0deYSBvs+vnK m9Dp7betXEjI+SX+CERWWxkm+G1zelltMNXqVujZdZs/lEBOP7OdTq86Qmqyxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from smtpclient.apple (unknown [IPv6:2a02:8109:1101:be00:d8e4:fc6f:9ab0:98d3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: tuexen) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cZ1Jv6Y1nzDCd; Sat, 27 Sep 2025 21:47:43 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Content-Type: text/plain; charset=utf-8 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.100.1.1.5\)) Subject: Re: git: b4c6c3db0379 - stable/14 - ipfw: Teach ipfw that EtherIP is an upper layer protocol From: Michael Tuexen In-Reply-To: Date: Sat, 27 Sep 2025 23:47:40 +0200 Cc: Justin Hibbits , Zhenlei Huang , src-committers , "" , dev-commits-src-branches@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <270A504B-9801-41D0-A214-39C4389B0670@FreeBSD.org> References: <202509271513.58RFDst3083057@gitrepo.freebsd.org> <44DAB9B2-B037-49B0-9153-90B4CFBB6234@FreeBSD.org> <20250927143548.661e75f7@ralga.knownspace> <7CCC215D-E9EF-49CD-95A1-F2D5215AD268@FreeBSD.org> To: Warner Losh X-Mailer: Apple Mail (2.3864.100.1.1.5) > On 27. Sep 2025, at 21:12, Warner Losh wrote: >=20 >=20 >=20 > On Sat, Sep 27, 2025, 12:44=E2=80=AFPM Michael Tuexen = wrote: > > On 27. Sep 2025, at 20:35, Justin Hibbits = wrote: > >=20 > > On Sat, 27 Sep 2025 20:32:20 +0200 > > Michael Tuexen wrote: > >=20 > >>> On 27. Sep 2025, at 17:13, Zhenlei Huang wrote: > >>>=20 > >>> The branch stable/14 has been updated by zlei: > >>>=20 > >>> URL: > >>> = https://cgit.FreeBSD.org/src/commit/?id=3Db4c6c3db0379a5b3d34143325805cd7e= 68cf3d9a > >>>=20 > >>> commit b4c6c3db0379a5b3d34143325805cd7e68cf3d9a > >>> Author: Zhenlei Huang > >>> AuthorDate: 2025-09-16 15:58:24 +0000 > >>> Commit: Zhenlei Huang > >>> CommitDate: 2025-09-27 15:11:35 +0000 > >>>=20 > >>> ipfw: Teach ipfw that EtherIP is an upper layer protocol > >>>=20 > >>> 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 ). > >>>=20 > >>> PR: 227450 > >>> Reviewed by: ae, #network > >>> MFC after: 1 week > >>> Differential Revision: https://reviews.freebsd.org/D52566 > >>>=20 > >>> (cherry picked from commit > >>> 0418e6690e91aa6c38dd9af9da43c4c5a9dc1cd2) (cherry picked from > >>> commit b1c96e54b906d0cdea0b5a9c74cc295803dfe50e) =20 > >> Why is this cherry picked from two commits? Shouldn't this be only > >> cherry picked from the commit to the main branch? > >>=20 > >> Best regards > >> Michael > >=20 > > 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. > That is why I am asking. >=20 > My understanding is that we should > * MFC from main to stable/15 > * MFC from main to stable/14 > * MFC from stable/14 to releng/14.4 >=20 > So I might be wrong and and I should actually do instead > * MFC from main to stable/15 > * MFC from stable/15 to stable/14 > * MFC from stable/14 to releng/14.4 >=20 > I know that releng/14.4 does not exist, but there is a time window > we can get changes into relen/14.4 with approval from re@. >=20 > I would just like to know how I should MFC to stable/14... >=20 > Either way works. Without conflicts I do main to both. With conflicts = I do main to 15 and then 15 to 14. For releng, it's always from the = stable branch. Hi Warner, thanks for the clarification. Best regards Michael >=20 > Warner >=20 > Best regards > Michael > >=20 > > - Justin > >=20 > >>> --- > >>> sys/netpfil/ipfw/ip_fw2.c | 7 +++++++ > >>> 1 file changed, 7 insertions(+) > >>>=20 > >>> 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 > >>>=20 > >>> #include > >>> @@ -1717,6 +1718,12 @@ do { \ > >>> PULLUP_TO(hlen, ulp, struct ip); > >>> break; > >>>=20 > >>> + 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; =20 > >>=20 > >=20 >=20