From nobody Thu Aug 21 16:27:50 2025 X-Original-To: freebsd-current@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 4c77yy2z2Zz65Mrs for ; Thu, 21 Aug 2025 16:27:54 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta004.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c77yy0ZMqz3Snt; Thu, 21 Aug 2025 16:27:54 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTPS id p3YkuKwFR5Mqyp88nuIv7V; Thu, 21 Aug 2025 16:27:53 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id p88luqn2YWX70p88mukWYl; Thu, 21 Aug 2025 16:27:53 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=d71WygjE c=1 sm=1 tr=0 ts=68a74909 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=2OwXVqhp2XgA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=esGRnhX4Ui-wnmaUFgAA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 1B773145; Thu, 21 Aug 2025 09:27:51 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id D9BCC307; Thu, 21 Aug 2025 09:27:50 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Warner Losh cc: Cy Schubert , Mark Johnston , =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= , freebsd-current@freebsd.org, ivy@freebsd.org Subject: Re: HEADS UP: MIT KRB5 1.22.1 Import In-reply-to: References: <20250821055519.65D8B684@slippy.cwsent.com> <86frdlkw30.fsf@ltc.des.dev> <20250821093615.B4293211@slippy.cwsent.com> <20250821151023.39D09205@slippy.cwsent.com> Comments: In-reply-to Warner Losh message dated "Thu, 21 Aug 2025 09:13:03 -0600." List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 21 Aug 2025 09:27:50 -0700 Message-Id: <20250821162750.D9BCC307@slippy.cwsent.com> X-CMAE-Envelope: MS4xfNItquK1414Svw3XsiJguk2CzBFWPIQE7BZ1F5wtFVX0qbzXazoF7lmsMcy4nlNGcWR7dlce4QRj6aDysmnhLaPRrJbjMJDGeDUtGj+aLR66SnkkjNeu CgSIsRmrTDFcTBSvBKcpNdzwrRSsq04uQCmJz5Gc2mkL7tqLEZ/WCGQhKeJMNnxEdLMxbk0UHhHAyioAtbTmXzsr2tWAeH9AUsSbU3uENzlXCqs0SJEiJIUh 2qgj2viGeWfzve4f2EaLBNVPiG6+nZKMxnf5D0PPHxqECKxSdjqlCkgWoxRD4TT3D5NkqIn/PBQTX4+YwWlRwQ== X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4c77yy0ZMqz3Snt In message , Warner Losh writes: > --0000000000004b0148063ce187a5 > Content-Type: text/plain; charset="UTF-8" > Content-Transfer-Encoding: quoted-printable > > On Thu, Aug 21, 2025 at 9:10=E2=80=AFAM Cy Schubert com> > wrote: > > > In message , Mark Johnston writes: > > > On Thu, Aug 21, 2025 at 02:36:15AM -0700, Cy Schubert wrote: > > > > In message <86frdlkw30.fsf@ltc.des.dev>, > > =3D?utf-8?Q?Dag-Erling_Sm=3DC3=3DB8rgrav > > > ? > > > > =3D w > > > > rites: > > > > > Cy Schubert writes: > > > > > > KRB5 1.22.0 released with a GSSAPI bug (CVE-2025-57736). The poin= > t > > patc > > > h=3D > > > > > =3D20 > > > > > > was applied on Aug 19 (f96110babbe1). 1.22.1 contains the point > > patch p > > > lu=3D > > > > > s=3D20 > > > > > > an additional GSSAPI patch. I intend to commit it to HEAD after a > > few d > > > ay=3D > > > > > s=3D20 > > > > > > of testing on Aug 25. > > > > > > > > > > Please post your patch for review (using git arc, as described in t= > he > > > > > committers guide) so others can test it too. > > > > > > > > git arc does not work with vendor merges. There is a way to trick it > > though > > > . > > > > > > What problem do you run into exactly? Could you provide a recipe for m= > e > > > to reproduce it locally? > > > > It's a vendor import. It's the same problem we have with git rebase and > > git > > diff of a vendor import. (This is why vendor imports use a special > > procedure [see committers guide].) > > > > I think you just need to tell arc to use the first parent.... That would be the commit hash in the vendor branch? commit dbbb504963792cabf7a2ef862dbb92b254f56782 (HEAD -> krb5-1221) Merge: 458ac2b6e445 e5fe63eaf1d3 Author: Cy Schubert AuthorDate: Wed Aug 20 22:38:21 2025 -0700 Commit: Cy Schubert CommitDate: Wed Aug 20 22:40:52 2025 -0700 krb5: Update to 1.22.1 Merge commit 'e5fe63eaf1d35ebbeac17eeed04cf873fbb9b3da' into main commit e5fe63eaf1d35ebbeac17eeed04cf873fbb9b3da (tag: vendor/krb5/1.22.1, freebsd/vendor/krb5, vendor/krb5) Author: Cy Schubert AuthorDate: Wed Aug 20 22:22:31 2025 -0700 Commit: Cy Schubert CommitDate: Wed Aug 20 22:22:47 2025 -0700 krb5: Import MIT 1.22.1 Security: CVE-2025-57736 Note that a git format-patch -2 doesn't include the e5fe63eaf1d35ebbeac17eeed04cf873fbb9b3da commit. I don't understand why the vendor commit no longer appears in history after the vendor branch merge has been pushed. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 > > I've created a generic patch and have created a revision with it. But it > > will not be used for the commit because it affects history. > > > > Warner >