new file mode 100644
@@ -0,0 +1,102 @@
+From a5742dea36a84dece8a01526cdef0714aecac070 Mon Sep 17 00:00:00 2001
+From: "GPT 5.6" <codex@openai.com>
+Date: Sun, 12 Jul 2026 14:12:16 +0200
+Subject: [PATCH 12/38] fix: reject joined unsafe short options
+
+GitPython blocks options such as --upload-pack/-u and --config/-c
+because they can execute arbitrary commands unless unsafe options are
+explicitly allowed. Git also accepts a short option with its value
+joined to the same token, including after clusterable flags. Forms
+such as -uVALUE, -fuVALUE, -cVALUE, and -vcVALUE could therefore
+bypass an exact-token check.
+
+Parse single-dash option tokens sufficiently to recognize blocked
+short options while preserving safe attached values such as
+-oupstream. Also distinguish clone multi-option values from bare
+kwargs so positional values are not treated as long-option
+abbreviations.
+
+This completes the option-validation hardening for
+GHSA-2f96-g7mh-g2hx.
+
+CVE: CVE-2026-67324
+Upstream-Status: Backport [https://github.com/gitpython-developers/GitPython/commit/56806080c1348749b07daa4a2024ce47b3cad285]
+
+Backport Changes:
+- Omit upstream regression test changes because the current
+ PyPI source archive does not include its test suite.
+
+Reviewed-by: Sebastian Thiel <sebastian.thiel@icloud.com>
+(cherry picked from commit 56806080c1348749b07daa4a2024ce47b3cad285)
+Signed-off-by: Yogita Urade <yurade@cisco.com>
+---
+ git/cmd.py | 40 ++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 36 insertions(+), 4 deletions(-)
+
+diff --git a/git/cmd.py b/git/cmd.py
+index 81ea0b3c..1903bb01 100644
+--- a/git/cmd.py
++++ b/git/cmd.py
+@@ -562,10 +562,23 @@ class Git(LazyMixin):
+
+ @classmethod
+ def check_unsafe_options(cls, options: List[str], unsafe_options: List[str]) -> None:
+- """Check for unsafe options.
+-
+- Some options that are passed to `git <command>` can be used to execute
+- arbitrary commands, this are blocked by default.
++ """Raise :class:`~git.exc.UnsafeOptionError` for blocked option spellings.
++
++ In addition to exact matches, this rejects abbreviated long options accepted
++ by Git (for example, ``--upl`` for ``--upload-pack``) and unsafe short options
++ whose values are joined to the same token, including after clusterable flags
++ (for example, ``-uVALUE`` and ``-fuVALUE``).
++
++ A list containing only bare names is treated as normalized keyword arguments,
++ so multi-character names such as ``upload_p`` are checked as long-option
++ abbreviations. If any item starts with ``-``, the list is treated as tokenized
++ command-line input: bare items can be option values and are not checked as
++ abbreviations. Thus ``["--origin", "upload"]`` is allowed. Single-dash options
++ use short-option parsing rather than broad prefix matching, preserving safe
++ attached values such as ``-oupstream`` and ``-bcurrent``.
++
++ Some options passed to ``git <command>`` can execute arbitrary commands and
++ are therefore blocked by default unless the caller explicitly allows them.
+ """
+ # Options can be of the form `foo`, `--foo`, `--foo bar`, or `--foo=bar`.
+ # Git accepts any unambiguous prefix of a long option, so an abbreviated
+@@ -575,6 +588,15 @@ class Git(LazyMixin):
+ # can be abbreviations; single-character short options remain exact-match
+ # only.
+ canonical_unsafe_options = {cls._canonicalize_option_name(option): option for option in unsafe_options}
++ unsafe_short_options = {
++ canonical: option
++ for canonical, option in canonical_unsafe_options.items()
++ if option.startswith("-") and not option.startswith("--") and len(canonical) == 1
++ }
++ # These value-less Git flags can be clustered before another short option
++ # (for example, ``-fuVALUE``). Stop at any other character because it may
++ # begin an attached value, as ``o`` does in the safe option ``-oupstream``.
++ clusterable_short_options = frozenset("46flnqsv")
+ options_are_kwargs = all(not option.startswith("-") for option in options)
+ for option in options:
+ candidate = cls._canonicalize_option_name(option)
+@@ -583,6 +605,16 @@ class Git(LazyMixin):
+ unsafe_option = canonical_unsafe_options.get(candidate)
+ if unsafe_option is not None:
+ raise UnsafeOptionError(f"{unsafe_option} is not allowed, use `allow_unsafe_options=True` to allow it.")
++ option_token = option.split("=", 1)[0].split(None, 1)[0]
++ if option_token.startswith("-") and not option_token.startswith("--"):
++ for option_char in option_token[1:]:
++ unsafe_option = unsafe_short_options.get(option_char)
++ if unsafe_option is not None:
++ raise UnsafeOptionError(
++ f"{unsafe_option} is not allowed, use `allow_unsafe_options=True` to allow it."
++ )
++ if option_char not in clusterable_short_options:
++ break
+ if not (option.startswith("--") or (options_are_kwargs and len(candidate) > 1)):
+ continue
+ for canonical, unsafe_option in canonical_unsafe_options.items():
+--
+2.35.6
@@ -25,6 +25,7 @@ SRC_URI += " file://CVE-2026-42284.patch \
file://CVE-2026-67323.patch \
file://CVE-2026-67325_p1.patch \
file://CVE-2026-67325_p2.patch \
+ file://CVE-2026-67324.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/56806080c1348749b07daa4a2024ce47b3cad285 [2] https://www.cve.org/CVERecord?id=CVE-2026-67324 Signed-off-by: Yogita Urade <yurade@cisco.com> --- .../python/python3-git/CVE-2026-67324.patch | 102 ++++++++++++++++++ .../python/python3-git_3.1.42.bb | 1 + 2 files changed, 103 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-git/CVE-2026-67324.patch