new file mode 100644
@@ -0,0 +1,135 @@
+From fc5d625a6c45ac58a59dcf8fef246635080a1cbb Mon Sep 17 00:00:00 2001
+From: "GPT 5.6" <codex@openai.com>
+Date: Wed, 22 Jul 2026 04:46:13 +0200
+Subject: [PATCH 17/38] fix: guard diff output options
+
+<!-- agent -->
+
+Reject unsafe diff options before revision parsing or Git invocation so
+callers cannot write command output to arbitrary filesystem paths.
+
+Cover commit and index diffs, including option-like revisions, and
+preserve an explicit allow_unsafe_options escape hatch.
+
+References GHSA-fjr4-x663-mwxc.
+Validated against Git baseline a23bace9.
+
+CVE: CVE-2026-73624
+Upstream-Status: Backport [https://github.com/gitpython-developers/GitPython/commit/1d51b891d7f236044a6aa17498ec682b63dad6e6]
+
+Backport Changes:
+- Omit upstream regression test changes because the current
+ PyPI source archive does not include its test suite.
+- Use the Scarthgap IndexFile.Index spelling while carrying
+ the upstream guard into the existing API.
+
+Co-authored-by: Sebastian Thiel <sebastian.thiel@icloud.com>
+(cherry picked from commit 1d51b891d7f236044a6aa17498ec682b63dad6e6)
+Signed-off-by: Yogita Urade <yurade@cisco.com>
+---
+ git/diff.py | 15 +++++++++++++--
+ git/index/base.py | 17 +++++++++++++++--
+ 2 files changed, 28 insertions(+), 4 deletions(-)
+
+diff --git a/git/diff.py b/git/diff.py
+index aba1a108..37ff2624 100644
+--- a/git/diff.py
++++ b/git/diff.py
+@@ -5,7 +5,7 @@
+
+ import re
+
+-from git.cmd import handle_process_output
++from git.cmd import Git, handle_process_output
+ from git.compat import defenc
+ from git.util import finalize_process, hex_to_bin
+
+@@ -109,6 +109,7 @@ class Diffable:
+ other: Union[Type["Index"], "Tree", "Commit", None, str, object] = Index,
+ paths: Union[PathLike, List[PathLike], Tuple[PathLike, ...], None] = None,
+ create_patch: bool = False,
++ allow_unsafe_options: bool = False,
+ **kwargs: Any,
+ ) -> "DiffIndex":
+ """Create diffs between two items being trees, trees and index or an
+@@ -134,6 +135,10 @@ class Diffable:
+ applied makes the self to other. Patches are somewhat costly as blobs have
+ to be read and diffed.
+
++ :param allow_unsafe_options:
++ If ``True``, allow options such as ``--output`` that can write to arbitrary
++ filesystem paths.
++
+ :param kwargs:
+ Additional arguments passed to git-diff, such as ``R=True`` to swap both
+ sides of the diff.
+@@ -145,7 +150,13 @@ class Diffable:
+ :class:`~Diffable.Index`, or as :class:`~git.objects.tree.Tree` or
+ :class:`~git.objects.commit.Commit`, or a git command error will occur.
+ """
+- args: List[Union[PathLike, Diffable, Type["Diffable.Index"], object]] = []
++ if not allow_unsafe_options:
++ Git.check_unsafe_options(
++ options=Git._option_candidates([other], kwargs),
++ unsafe_options=self.repo.unsafe_git_revision_options,
++ )
++
++ args: List[Union[PathLike, Diffable]] = []
+ args.append("--abbrev=40") # We need full shas.
+ args.append("--full-index") # Get full index paths, not only filenames.
+
+diff --git a/git/index/base.py b/git/index/base.py
+index 9d1db4e3..c3d1771c 100644
+--- a/git/index/base.py
++++ b/git/index/base.py
+@@ -19,6 +19,7 @@ from git.compat import (
+ force_bytes,
+ defenc,
+ )
++from git.cmd import Git
+ from git.exc import GitCommandError, CheckoutError, GitError, InvalidGitRepositoryError
+ from git.objects import (
+ Blob,
+@@ -1411,6 +1412,7 @@ class IndexFile(LazyMixin, git_diff.Diffable, Serializable):
+ other: Union[Type["git_diff.Diffable.Index"], "Tree", "Commit", str, None] = git_diff.Diffable.Index,
+ paths: Union[PathLike, List[PathLike], Tuple[PathLike, ...], None] = None,
+ create_patch: bool = False,
++ allow_unsafe_options: bool = False,
+ **kwargs: Any,
+ ) -> git_diff.DiffIndex:
+ """Diff this index against the working copy or a Tree or Commit object.
+@@ -1422,6 +1424,11 @@ class IndexFile(LazyMixin, git_diff.Diffable, Serializable):
+ Will only work with indices that represent the default git index as
+ they have not been initialized with a stream.
+ """
++ if not allow_unsafe_options:
++ Git.check_unsafe_options(
++ options=Git._option_candidates([other], kwargs),
++ unsafe_options=self.repo.unsafe_git_revision_options,
++ )
+
+ # Only run if we are the default repository index.
+ if self._file_path != self._index_path():
+@@ -1441,7 +1448,13 @@ class IndexFile(LazyMixin, git_diff.Diffable, Serializable):
+ # Invert the existing R flag.
+ cur_val = kwargs.get("R", False)
+ kwargs["R"] = not cur_val
+- return other.diff(self.Index, paths, create_patch, **kwargs)
++ return other.diff(
++ self.Index,
++ paths,
++ create_patch,
++ allow_unsafe_options=allow_unsafe_options,
++ **kwargs,
++ )
+ # END diff against other item handling
+
+ # If other is not None here, something is wrong.
+@@ -1449,4 +1462,4 @@ class IndexFile(LazyMixin, git_diff.Diffable, Serializable):
+ raise ValueError("other must be None, Diffable.Index, a Tree or Commit, was %r" % other)
+
+ # Diff against working copy - can be handled by superclass natively.
+- return super().diff(other, paths, create_patch, **kwargs)
++ return super().diff(other, paths, create_patch, allow_unsafe_options=allow_unsafe_options, **kwargs)
+--
+2.35.6
@@ -30,6 +30,7 @@ SRC_URI += " file://CVE-2026-42284.patch \
file://CVE-2026-69097.patch \
file://CVE-2026-73625.patch \
file://CVE-2026-73623.patch \
+ file://CVE-2026-73624.patch \
"
SRC_URI[sha256sum] = "2d99869e0fef71a73cbd242528105af1d6c1b108c60dfabd994bf292f76c3ceb"
This patch applies the upstream fix as referenced in [2], using the commit shown in [1]. [1] https://github.com/gitpython-developers/GitPython/commit/1d51b891d7f236044a6aa17498ec682b63dad6e6 [2] https://www.cve.org/CVERecord?id=CVE-2026-73624 Signed-off-by: Yogita Urade <yurade@cisco.com> --- .../python/python3-git/CVE-2026-73624.patch | 135 ++++++++++++++++++ .../python/python3-git_3.1.42.bb | 1 + 2 files changed, 136 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-git/CVE-2026-73624.patch