From nobody Sat Sep 27 18:44:23 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 4cYxFR16jNz68Vrt; Sat, 27 Sep 2025 18:44:27 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 4cYxFR0KY7z3TTV; Sat, 27 Sep 2025 18:44:27 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758998667; 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=S89P3/m5dU4csyU1xwkIzsYpgxD+Ii7fztPrXp1fI9g=; b=E8uf4f++L+r2+8Pi17UZUGEuUJMDeZoXq/plLgjwS8iYPJuxfchNkxx8fBvA171SjkR4vJ LaHuWB8LPDufNiDaOZQINFl6qP4Jfd36KkE06Rjlpkt65DyvL5v5Gf92D73tI3O0qBtbXe M6E+5j5H1mvtfOb3Y4ZYHS+IwBc13wjYNh20lV6KwJuLqkudKfctbKyYMjY8cmnztIdLqu 49p7ZauJ97Ll85iHtyZEDXy7IgY89nad6svrbRzdhEM4MZKjNnaBw1ZWyoAflQ3WbixXMs mPGdhdbFelTlB5GqNjgS5tMNc+eepyril2NyKDJ0WC5/onJ9YboUjArxWgwEDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758998667; 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=S89P3/m5dU4csyU1xwkIzsYpgxD+Ii7fztPrXp1fI9g=; b=LlWrP/6EsJIHhu+fcYb8oQLvx5KmYsNTKuOf4CEvSVB7cYe5Oq+JYKE8XqDDvRbLqZAfKj ez66tUgdfYQM7UBkN6+v07/liboUBFawLvhWBFT5Z86W8dD0lCDG0s1Cxov4925evbHUoa /V8Upi0E3qXQVE5axEGeiVi9h88Wh3J77XXdj05C7moi3U0P0AVdvgOsq3BEyKOWzxr90L qcKhUA9+2UxwllsnbRRkHgpiYWvCQOj3eXMgVCAh4rt2AQ8PKOdXDomBGomKQU/1wqvtdy vuxyzDAoURAmj6/cCbucCtHm5TOU/ca01Qg10axBYmRRghrhbXbRyCGcLn9V9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758998667; a=rsa-sha256; cv=none; b=XLFuaT1EBmnYYyaWAS0pWyH7lyarC3LSdcvTzOu1PHZPLHeZgOSkN6ZESyv5I0JMiND0DV 9zkQydIXpddHr7Vt1lMpqMMy3gUZy3XoeUQxinf9XX2Lw0Ng51ncS+/2WQ5o1KogZRvQtd XKVZr0auOu+M0wA3YjvzFnrsQTgHeNwzbc1kWWMn+hh2ojwYi0BjJlHDMHpXOXhJZsNXQO DsJsAgCRFzqO6YQ+vE2cWFg6tUiks7NLlCMB43oInmNYp9pCOiBe/wk7kKihiz+IC7hBIp ExGOz+SGUVMitafeRlcnvOmM1pR4ba0Yk88KEl2lY+xG3uFSeEDX0tRrf0BCFQ== 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 4cYxFP4TXJz9Np; Sat, 27 Sep 2025 18:44:25 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Content-Type: text/plain; charset=us-ascii 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 (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: <20250927143548.661e75f7@ralga.knownspace> Date: Sat, 27 Sep 2025 20:44:23 +0200 Cc: Zhenlei Huang , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <7CCC215D-E9EF-49CD-95A1-F2D5215AD268@FreeBSD.org> References: <202509271513.58RFDst3083057@gitrepo.freebsd.org> <44DAB9B2-B037-49B0-9153-90B4CFBB6234@FreeBSD.org> <20250927143548.661e75f7@ralga.knownspace> To: Justin Hibbits X-Mailer: Apple Mail (2.3864.100.1.1.5) > 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. 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 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 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@. I would just like to know how I should MFC to stable/14... 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