git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Philippe Blain <levraiphilippeblain@gmail.com>
Cc: git@vger.kernel.org, Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: What's cooking in git.git (Apr 2022, #03; Tue, 12)
Date: Wed, 13 Apr 2022 16:51:15 -0700	[thread overview]
Message-ID: <xmqqsfqg4k5o.fsf@gitster.g> (raw)
In-Reply-To: <8698e468-5552-77a3-10c7-933affd98832@gmail.com> (Philippe Blain's message of "Tue, 12 Apr 2022 13:52:16 -0400")

Philippe Blain <levraiphilippeblain@gmail.com> writes:

> This is quite a big behaviour change for some environments [1], so
> I would think maybe it deserves to be fully spelled out in the
> release notes for 2.36.0, instead of just referring readers to the
> release notes for the maintenance release, where they can read a
> full description only in the release notes for 2.30.3 ?

Makes sense.  Here is my quick-and-dirty first draft, based on the
design of the new escape hatch done by Derrick today.

diff --git c/Documentation/RelNotes/2.36.0.txt w/Documentation/RelNotes/2.36.0.txt
index 9f6dd3d868..f4c5e691bb 100644
--- c/Documentation/RelNotes/2.36.0.txt
+++ w/Documentation/RelNotes/2.36.0.txt
@@ -13,6 +13,15 @@ Backward compatibility warts
    top-level a partial clone, while submodules are fully cloned.  This
    behaviour is changed to pass the same filter down to the submodules.
 
+ * With the fixes for CVE-2022-24765 that are common with versions of
+   Git 2.30.4, 2.31.3, 2.32.2, 2.33.3, 2.34.3, and 2.35.3, Git has
+   been taught not to recognise repositories owned by other users, in
+   order to avoid getting affected by their config files and hooks.
+   You can list the path to the safe/trusted repositories that may be
+   owned by others on a multi-valued configuration variable
+   `safe.directory` to override this behaviour, or use '*' to declare
+   that you trust anything.
+
 
 Note to those who build from the source
 
@@ -397,8 +406,6 @@ Fixes since v2.35
    entry it moved.
    (merge b7f9130a06 vd/mv-refresh-stat later to maint).
 
- * Fix for CVE-2022-24765 has been merged up from 2.35.2 and others.
-
  * Other code cleanup, docfix, build fix, etc.
    (merge cfc5cf428b jc/find-header later to maint).
    (merge 40e7cfdd46 jh/p4-fix-use-of-process-error-exception later to maint).

  parent reply	other threads:[~2022-04-13 23:51 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-12 17:04 What's cooking in git.git (Apr 2022, #03; Tue, 12) Junio C Hamano
2022-04-12 17:52 ` Philippe Blain
2022-04-12 18:55   ` CVE-2022-24765 and core.sharedRepository (was: What's cooking in git.git (Apr 2022, #03; Tue, 12)) Ævar Arnfjörð Bjarmason
2022-04-13  3:10     ` demerphq
2022-04-13 23:51   ` Junio C Hamano [this message]
2022-04-13 20:08 ` ab/plug-leak-in-revisions " Ævar Arnfjörð Bjarmason
2022-04-13 23:32   ` ab/plug-leak-in-revisions Junio C Hamano
2022-04-14  7:22     ` ab/plug-leak-in-revisions Ævar Arnfjörð Bjarmason
2022-04-14 18:33       ` ab/plug-leak-in-revisions Junio C Hamano
2022-04-13 20:11 ` ab/ci-setup-simplify etc. (was: What's cooking in git.git (Apr 2022, #03; Tue, 12)) Ævar Arnfjörð Bjarmason

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqsfqg4k5o.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=johannes.schindelin@gmx.de \
    --cc=levraiphilippeblain@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).