From nobody Sat Sep 27 18:32:20 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 4cYwzZ1k0jz68Vds; Sat, 27 Sep 2025 18:32:26 +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 4cYwzY62TDz3RvL; Sat, 27 Sep 2025 18:32:25 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758997945; 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=RtTXJG8+05Sbb1Eq5JWrKGbEZGyDqi0Yx25ylagk+0U=; b=OGqveaLJfYIAaY+77ICSALGVp60QrQW0Yg97ScR+Iwmv8xefDk7yXNDkSs6yrtUDq5G4IM P89G5oacEjk5dPfBmxeZdGaYyfKgh7yASSTfP3xQuK9ytjLDW0/h6QlhDTqmwOMmbJ20LM C+HyXFVSyFLSVSrRyoKhl/w/LrBGvbfDPaFwfhtTOyx7nqrgqPAouslh9tsTcD+R3+BfY4 zJMB2Zcjd1/Rrn66RBlXTbTYVJLgWIf0UPaokI2kdoI9pCtD0W1+azjWqAru2pabrHhr4s WYSwXm8qnzJTrzngzRje14CiTPx+ach/xqaVNpXFC3376Cu8IURY88yaKELf2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758997945; 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=RtTXJG8+05Sbb1Eq5JWrKGbEZGyDqi0Yx25ylagk+0U=; b=ko+QEiW21IblN+FUsXWjayfV2zYeYrQX2nPezdNMeezbvaLarHO16rrSUlfrMiw4gtio3m YmNC1d2PSZyqTPrkexxN39k/sX47eDOextmrdh0noeWRl+izJ0MGCrSowNO17/SdEUYAFU Xikeq2IKyVpF692l8jZDCph/ze5ll1f2Yaw5v2FXaSX3TUQZA/WU2ep/zsnRFK3sIDwEuk Rw3sYZcL4kWpdfe4SLHGjKIOsgtnvxidWZ239dn2Hy+WsTsa174tCZzPJNK2rEXPW0/tNQ ICoeEWfPzxi4sMZGTa6wDfHtZH5zralMtxLmw1fpaeK4wA+BPdvy9c8Gdc35jA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758997945; a=rsa-sha256; cv=none; b=BZAXNfmICDvqhcFTM75uBCx0J2HStMxhUzjrzSZVAX0YcUehRlOCwsMOJJsbS3bBOif4tV ADehFVi4Yqg2bboLPizVdCHQvpTazLmTSAhBQVDIxsonue1dZakUraYZSYchgGnovR8ndK oI+awYpUi9pV7QgBrfcHtPikrmQJkQUKLFjl5G6GQE+DHHe7ABC2rQC7uP5Z6MnW+hXTct 78+lIgt9KwXdh8cMqDZJqw/K+QXaHDvh1ikCNQ7X3kbVkm9N7sxaMaQsgi69ovc+eZaIZU xn8iHl1b2Z4dsoLqrxZQziG1qU+DLdm4xGevXKruXYns1Uyk8oO61B52TtEZ5A== 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 4cYwzY1vHlz82h; Sat, 27 Sep 2025 18:32: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: <202509271513.58RFDst3083057@gitrepo.freebsd.org> Date: Sat, 27 Sep 2025 20:32:20 +0200 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <44DAB9B2-B037-49B0-9153-90B4CFBB6234@FreeBSD.org> References: <202509271513.58RFDst3083057@gitrepo.freebsd.org> To: Zhenlei Huang X-Mailer: Apple Mail (2.3864.100.1.1.5) > 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) 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 > --- > 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;