Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Yogita Urade <yurade@cisco.com>
To: openembedded-core@lists.openembedded.org
Subject: [OE-core][wrynose][PATCH 01/27] python3-git: fix CVE-2026-67326
Date: Thu, 15 Oct 2026 22:40:40 -0700	[thread overview]
Message-ID: <20261016054106.210444-2-yurade@cisco.com> (raw)
In-Reply-To: <20261016054106.210444-1-yurade@cisco.com>

This patch applies the upstream fix as referenced in [2],
using the commit shown in [1].

[1] https://github.com/gitpython-developers/GitPython/commit/54538428f79b0c91ba52cda5229856a6edf7ac06
[2] https://nvd.nist.gov/vuln/detail/CVE-2026-67326

Signed-off-by: Yogita Urade <yurade@cisco.com>
---
 .../python/python3-git/CVE-2026-67326.patch   | 108 ++++++++++++++++++
 .../python/python3-git_3.1.43.bb              |   1 +
 2 files changed, 109 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python3-git/CVE-2026-67326.patch

diff --git a/meta/recipes-devtools/python/python3-git/CVE-2026-67326.patch b/meta/recipes-devtools/python/python3-git/CVE-2026-67326.patch
new file mode 100644
index 0000000000..2689d1cc74
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-git/CVE-2026-67326.patch
@@ -0,0 +1,108 @@
+From 89d7d33485f67d5f25777079797ae6d1a4538f86 Mon Sep 17 00:00:00 2001
+From: "GPT 5.5" <codex@openai.com>
+Date: Tue, 5 May 2026 21:34:42 +0800
+Subject: [PATCH] Validate config key section names before writing
+
+GitConfigParser already rejected CR, LF, and NUL in config values before
+writing, but section and option names could still reach configparser. Because
+GitPython writes section headers itself, a newline-bearing section name could
+split the output into additional headers.
+
+Reject CR, LF, and NUL in section and option names on write paths that create
+or set config keys: add_section(), set(), set_value(), add_value(), and
+rename_section() destinations. This matches Git config key validation behavior;
+Git source commit 94f057755b7941b321fd11fec1b2e3ca5313a4e0 reports invalid keys
+containing newlines from config.c, and local git 2.50.1 rejects newline-bearing
+config keys.
+
+Add a regression test covering unsafe section and option names while preserving
+safe writes.
+
+CVE: CVE-2026-67326
+Upstream-Status: Backport [https://github.com/gitpython-developers/GitPython/commit/54538428f79b0c91ba52cda5229856a6edf7ac06]
+
+Backport Changes:
+- Omitted test/test_config.py because the current PyPI source 
+  archive does not include the test suite and the python3-git 
+  recipe does not run it.
+
+Co-authored-by: Sebastian Thiel <sebastian.thiel@icloud.com>
+(cherry picked from commit 54538428f79b0c91ba52cda5229856a6edf7ac06)
+Signed-off-by: Yogita Urade <yurade@cisco.com>
+---
+ git/config.py | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+diff --git a/git/config.py b/git/config.py
+index 1595d51f..236de3a6 100644
+--- a/git/config.py
++++ b/git/config.py
+@@ -72,6 +72,9 @@ CONDITIONAL_INCLUDE_REGEXP = re.compile(r"(?<=includeIf )\"(gitdir|gitdir/i|onbr
+ See: https://git-scm.com/docs/git-config#_conditional_includes
+ """
+ 
++UNSAFE_CONFIG_CHARS_RE = re.compile(r"[\r\n\x00]")
++"""Characters that cannot be safely written in config names or values."""
++
+ 
+ class MetaParserBuilder(abc.ABCMeta):  # noqa: B024
+     """Utility class wrapping base-class methods into decorators that assure read-only
+@@ -759,6 +762,7 @@ class GitConfigParser(cp.RawConfigParser, metaclass=MetaParserBuilder):
+ 
+     def add_section(self, section: str) -> None:
+         """Assures added options will stay in order."""
++        self._assure_config_name_safe(section, "section")
+         return super().add_section(section)
+ 
+     @property
+@@ -865,10 +869,14 @@ class GitConfigParser(cp.RawConfigParser, metaclass=MetaParserBuilder):
+ 
+     def _value_to_string_safe(self, value: Union[str, bytes, int, float, bool]) -> str:
+         value_str = self._value_to_string(value)
+-        if re.search(r"[\r\n\x00]", value_str):
++        if UNSAFE_CONFIG_CHARS_RE.search(value_str):
+             raise ValueError("Git config values must not contain CR, LF, or NUL")
+         return value_str
+ 
++    def _assure_config_name_safe(self, name: "cp._SectionName", label: str) -> None:
++        if isinstance(name, str) and UNSAFE_CONFIG_CHARS_RE.search(name):
++            raise ValueError("Git config %s names must not contain CR, LF, or NUL" % label)
++
+     @needs_values
+     @set_dirty_and_flush_changes
+     def set(
+@@ -877,6 +885,8 @@ class GitConfigParser(cp.RawConfigParser, metaclass=MetaParserBuilder):
+         option: str,
+         value: Union[str, bytes, int, float, bool, None] = None,
+     ) -> None:
++        self._assure_config_name_safe(section, "section")
++        self._assure_config_name_safe(option, "option")
+         if value is not None:
+             value = self._value_to_string_safe(value)
+         return super().set(section, option, value)
+@@ -901,6 +911,8 @@ class GitConfigParser(cp.RawConfigParser, metaclass=MetaParserBuilder):
+         :return:
+             This instance
+         """
++        self._assure_config_name_safe(section, "section")
++        self._assure_config_name_safe(option, "option")
+         value_str = self._value_to_string_safe(value)
+         if not self.has_section(section):
+             self.add_section(section)
+@@ -929,6 +941,8 @@ class GitConfigParser(cp.RawConfigParser, metaclass=MetaParserBuilder):
+         :return:
+             This instance
+         """
++        self._assure_config_name_safe(section, "section")
++        self._assure_config_name_safe(option, "option")
+         value_str = self._value_to_string_safe(value)
+         if not self.has_section(section):
+             self.add_section(section)
+@@ -949,6 +963,7 @@ class GitConfigParser(cp.RawConfigParser, metaclass=MetaParserBuilder):
+         """
+         if not self.has_section(section):
+             raise ValueError("Source section '%s' doesn't exist" % section)
++        self._assure_config_name_safe(new_name, "section")
+         if self.has_section(new_name):
+             raise ValueError("Destination section '%s' already exists" % new_name)
+ 
diff --git a/meta/recipes-devtools/python/python3-git_3.1.43.bb b/meta/recipes-devtools/python/python3-git_3.1.43.bb
index ebb5e4b442..474206d4ed 100644
--- a/meta/recipes-devtools/python/python3-git_3.1.43.bb
+++ b/meta/recipes-devtools/python/python3-git_3.1.43.bb
@@ -21,6 +21,7 @@ SRC_URI += "file://CVE-2026-42284.patch \
            file://CVE-2026-44243_p2.patch \
            file://CVE-2026-44244_p1.patch \
            file://CVE-2026-44244_p2.patch \
+           file://CVE-2026-67326.patch \
            "
 SRC_URI[sha256sum] = "35f314a9f878467f5453cc1fee295c3e18e52f1b99f10f6cf5b1682e968a9e7c"
 
-- 
2.44.4



  reply	other threads:[~2026-10-16  5:41 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-16  5:40 [OE-core][wrynose][PATCH 0/27] python3-git: Security fixes Yogita Urade
2026-10-16  5:40 ` Yogita Urade [this message]
2026-10-16  5:40 ` [OE-core][wrynose][PATCH 02/27] python3-git: fix CVE-2026-67323 Yogita Urade
2026-10-20 10:19   ` Yoann Congal
2026-10-16  5:40 ` [OE-core][wrynose][PATCH 03/27] python3-git: fix CVE-2026-67325 Yogita Urade
2026-10-16  5:40 ` [OE-core][wrynose][PATCH 04/27] python3-git: fix CVE-2026-67324 Yogita Urade
2026-10-20 10:25   ` Yoann Congal
2026-10-16  5:40 ` [OE-core][wrynose][PATCH 05/27] python3-git: fix CVE-2026-67322 Yogita Urade
2026-10-16  5:40 ` [OE-core][wrynose][PATCH 06/27] python3-git: fix CVE-2026-69097 Yogita Urade
2026-10-20 10:32   ` Yoann Congal
2026-10-16  5:40 ` [OE-core][wrynose][PATCH 07/27] python3-git: fix CVE-2026-73625 Yogita Urade
2026-10-16  5:40 ` [OE-core][wrynose][PATCH 08/27] python3-git: fix CVE-2026-73623 Yogita Urade
2026-10-16  5:40 ` [OE-core][wrynose][PATCH 09/27] python3-git: fix CVE-2026-73624 Yogita Urade
2026-10-16  5:40 ` [OE-core][wrynose][PATCH 10/27] python3-git: fix CVE-2026-73622 Yogita Urade
2026-10-16  5:40 ` [OE-core][wrynose][PATCH 11/27] python3-git: fix CVE-2026-73621 Yogita Urade
2026-10-16  5:40 ` [OE-core][wrynose][PATCH 12/27] python3-git: fix CVE-2026-73620 Yogita Urade
2026-10-16  5:40 ` [OE-core][wrynose][PATCH 13/27] python3-git: fix CVE-2026-73619 Yogita Urade
2026-10-16  5:40 ` [OE-core][wrynose][PATCH 14/27] python3-git: fix CVE-2026-76221 Yogita Urade
2026-10-16  5:40 ` [OE-core][wrynose][PATCH 15/27] python3-git: fix CVE-2026-76220 Yogita Urade
2026-10-16  5:40 ` [OE-core][wrynose][PATCH 16/27] python3-git: fix CVE-2026-76219 Yogita Urade
2026-10-16  5:40 ` [OE-core][wrynose][PATCH 17/27] python3-git: fix CVE-2026-76218 Yogita Urade
2026-10-16  5:40 ` [OE-core][wrynose][PATCH 18/27] python3-git: fix CVE-2026-76217 Yogita Urade
2026-10-16  5:40 ` [OE-core][wrynose][PATCH 19/27] python3-git: fix CVE-2026-76222 Yogita Urade
2026-10-16  5:40 ` [OE-core][wrynose][PATCH 20/27] python3-git: fix CVE-2026-78678 CVE-2026-78679 Yogita Urade
2026-10-16  5:41 ` [OE-core][wrynose][PATCH 21/27] python3-git: fix CVE-2026-78677 Yogita Urade
2026-10-16  5:41 ` [OE-core][wrynose][PATCH 22/27] python3-git: fix CVE-2026-78676 Yogita Urade
2026-10-16  5:41 ` [OE-core][wrynose][PATCH 23/27] python3-git: fix CVE-2026-78675 Yogita Urade
2026-10-16  5:41 ` [OE-core][wrynose][PATCH 24/27] python3-git: fix CVE-2026-87817 Yogita Urade
2026-10-16  5:41 ` [OE-core][wrynose][PATCH 25/27] python3-git: fix CVE-2026-87818 Yogita Urade
2026-10-16  5:41 ` [OE-core][wrynose][PATCH 26/27] python3-git: Fix CVE-2026-87819 Yogita Urade
2026-10-16  5:41 ` [OE-core][wrynose][PATCH 27/27] python3-git: fix CVE-2026-100689 Yogita Urade
2026-10-20 10:37 ` [OE-core][wrynose][PATCH 0/27] python3-git: Security fixes Yoann Congal
2026-10-21  4:45   ` Yogita Urade -X (yurade - E INFOCHIPS PRIVATE LIMITED at Cisco)

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=20261016054106.210444-2-yurade@cisco.com \
    --to=yurade@cisco.com \
    --cc=openembedded-core@lists.openembedded.org \
    /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