* [OE-core][wrynose][PATCH 2/4] python3-git: fix CVE-2026-42215
2026-08-19 5:08 [OE-core][wrynose][PATCH 1/4] python3-git: fix CVE-2026-42284 Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
@ 2026-08-19 5:08 ` Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-09-02 13:01 ` Yoann Congal
2026-08-19 5:08 ` [OE-core][wrynose][PATCH 3/4] python3-git: fix CVE-2026-44243 Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-08-19 5:08 ` [OE-core][wrynose][PATCH 4/4] python3-git: fix CVE-2026-44244 Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
2 siblings, 1 reply; 6+ messages in thread
From: Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco) @ 2026-08-19 5:08 UTC (permalink / raw)
To: openembedded-core; +Cc: xe-linux-external, Darsh Kelaiya
From: Darsh Kelaiya <dkelaiya@cisco.com>
This patch applies the upstream fix as referenced in [4], using all the
backported commits shown in [1], [2], and [3].
[1] https://github.com/gitpython-developers/GitPython/commit/142195888e713542189533a52cdfc333f05c3af6
[2] https://github.com/gitpython-developers/GitPython/commit/9aed7cf8c20f69effcfcf7ebef09f312f73ab826
[3] https://github.com/gitpython-developers/GitPython/commit/43d92dec4683568d11495956dd556161f17c3ea8
[4] https://github.com/gitpython-developers/GitPython/security/advisories/GHSA-rpm5-65cw-6hj4
Signed-off-by: Darsh Kelaiya <dkelaiya@cisco.com>
---
.../python3-git/CVE-2026-42215_p1.patch | 60 +++++++++++++++++++
.../python3-git/CVE-2026-42215_p2.patch | 29 +++++++++
.../python3-git/CVE-2026-42215_p3.patch | 45 ++++++++++++++
.../python/python3-git_3.1.43.bb | 3 +
4 files changed, 137 insertions(+)
create mode 100644 meta/recipes-devtools/python/python3-git/CVE-2026-42215_p1.patch
create mode 100644 meta/recipes-devtools/python/python3-git/CVE-2026-42215_p2.patch
create mode 100644 meta/recipes-devtools/python/python3-git/CVE-2026-42215_p3.patch
diff --git a/meta/recipes-devtools/python/python3-git/CVE-2026-42215_p1.patch b/meta/recipes-devtools/python/python3-git/CVE-2026-42215_p1.patch
new file mode 100644
index 0000000000..0129250fdf
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-git/CVE-2026-42215_p1.patch
@@ -0,0 +1,60 @@
+From dd5d1c4ddcc5d44faf4e71bcfa338f09db2022d6 Mon Sep 17 00:00:00 2001
+From: w <w@mac.lan>
+Date: Mon, 20 Apr 2026 23:29:50 -0400
+Subject: [PATCH] Block unsafe underscored git kwargs / Fix for
+ GHSA-rpm5-65cw-6hj4
+
+CVE: CVE-2026-42215
+Upstream-Status: Backport [https://github.com/gitpython-developers/GitPython/commit/142195888e713542189533a52cdfc333f05c3af6]
+
+Backport Changes:
+- Omitted test/test_clone.py, test/test_git.py, and
+ test/test_remote.py because the PyPI 3.1.43 source used by the
+ recipe does not ship the upstream test tree.
+
+(cherry picked from commit 142195888e713542189533a52cdfc333f05c3af6)
+Signed-off-by: Darsh Kelaiya <dkelaiya@cisco.com>
+---
+ git/cmd.py | 21 +++++++++++++--------
+ 1 file changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/git/cmd.py b/git/cmd.py
+index 90fc39cd..2ecb8e66 100644
+--- a/git/cmd.py
++++ b/git/cmd.py
+@@ -711,6 +711,12 @@ class Git(metaclass=_GitMeta):
+ f"The `{protocol}::` protocol looks suspicious, use `allow_unsafe_protocols=True` to allow it."
+ )
+
++ @classmethod
++ def _canonicalize_option_name(cls, option: str) -> str:
++ """Normalize an option or kwarg name for unsafe-option checks."""
++ option_name = option.lstrip("-").split("=", 1)[0].split(None, 1)[0]
++ return dashify(option_name)
++
+ @classmethod
+ def check_unsafe_options(cls, options: List[str], unsafe_options: List[str]) -> None:
+ """Check for unsafe options.
+@@ -718,15 +724,14 @@ class Git(metaclass=_GitMeta):
+ Some options that are passed to ``git <command>`` can be used to execute
+ arbitrary commands. These are blocked by default.
+ """
+- # Options can be of the form `foo`, `--foo bar`, or `--foo=bar`, so we need to
+- # check if they start with "--foo" or if they are equal to "foo".
+- bare_unsafe_options = [option.lstrip("-") for option in unsafe_options]
++ # Options can be of the form `foo`, `--foo`, `--foo bar`, or `--foo=bar`.
++ canonical_unsafe_options = {cls._canonicalize_option_name(option): option for option in unsafe_options}
+ for option in options:
+- for unsafe_option, bare_option in zip(unsafe_options, bare_unsafe_options):
+- if option.startswith(unsafe_option) or option == bare_option:
+- raise UnsafeOptionError(
+- f"{unsafe_option} is not allowed, use `allow_unsafe_options=True` to allow it."
+- )
++ unsafe_option = canonical_unsafe_options.get(cls._canonicalize_option_name(option))
++ if unsafe_option is not None:
++ raise UnsafeOptionError(
++ f"{unsafe_option} is not allowed, use `allow_unsafe_options=True` to allow it."
++ )
+
+ class AutoInterrupt:
+ """Process wrapper that terminates the wrapped process on finalization.
diff --git a/meta/recipes-devtools/python/python3-git/CVE-2026-42215_p2.patch b/meta/recipes-devtools/python/python3-git/CVE-2026-42215_p2.patch
new file mode 100644
index 0000000000..4326bede07
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-git/CVE-2026-42215_p2.patch
@@ -0,0 +1,29 @@
+From e77461e6953a67f17ecd1808c352e6613a17345b Mon Sep 17 00:00:00 2001
+From: w <w@mac.lan>
+Date: Mon, 20 Apr 2026 23:43:59 -0400
+Subject: [PATCH] linter fix
+
+CVE: CVE-2026-42215
+Upstream-Status: Backport [https://github.com/gitpython-developers/GitPython/commit/9aed7cf8c20f69effcfcf7ebef09f312f73ab826]
+
+(cherry picked from commit 9aed7cf8c20f69effcfcf7ebef09f312f73ab826)
+Signed-off-by: Darsh Kelaiya <dkelaiya@cisco.com>
+---
+ git/cmd.py | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/git/cmd.py b/git/cmd.py
+index 2ecb8e66..372eac28 100644
+--- a/git/cmd.py
++++ b/git/cmd.py
+@@ -729,9 +729,7 @@ class Git(metaclass=_GitMeta):
+ for option in options:
+ unsafe_option = canonical_unsafe_options.get(cls._canonicalize_option_name(option))
+ if unsafe_option is not None:
+- raise UnsafeOptionError(
+- f"{unsafe_option} is not allowed, use `allow_unsafe_options=True` to allow it."
+- )
++ raise UnsafeOptionError(f"{unsafe_option} is not allowed, use `allow_unsafe_options=True` to allow it.")
+
+ class AutoInterrupt:
+ """Process wrapper that terminates the wrapped process on finalization.
diff --git a/meta/recipes-devtools/python/python3-git/CVE-2026-42215_p3.patch b/meta/recipes-devtools/python/python3-git/CVE-2026-42215_p3.patch
new file mode 100644
index 0000000000..a23fba8d81
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-git/CVE-2026-42215_p3.patch
@@ -0,0 +1,45 @@
+From 3ee4db90229dbb1fbdc8572dc8219990d70db368 Mon Sep 17 00:00:00 2001
+From: w <w@mac.lan>
+Date: Tue, 21 Apr 2026 12:03:20 -0400
+Subject: [PATCH] git.cmd: harden unsafe option canonicalization and isolate
+ push test cases
+
+CVE: CVE-2026-42215
+Upstream-Status: Backport [https://github.com/gitpython-developers/GitPython/commit/43d92dec4683568d11495956dd556161f17c3ea8]
+
+Backport Changes:
+- Omitted test/test_remote.py because the PyPI 3.1.43 source used
+ by the recipe does not ship the upstream test tree.
+
+(cherry picked from commit 43d92dec4683568d11495956dd556161f17c3ea8)
+Signed-off-by: Darsh Kelaiya <dkelaiya@cisco.com>
+---
+ git/cmd.py | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/git/cmd.py b/git/cmd.py
+index 372eac28..a1e77bdb 100644
+--- a/git/cmd.py
++++ b/git/cmd.py
+@@ -713,9 +713,18 @@ class Git(metaclass=_GitMeta):
+
+ @classmethod
+ def _canonicalize_option_name(cls, option: str) -> str:
+- """Normalize an option or kwarg name for unsafe-option checks."""
+- option_name = option.lstrip("-").split("=", 1)[0].split(None, 1)[0]
+- return dashify(option_name)
++ """Return the option name used for unsafe-option checks.
++
++ Examples:
++ ``"--upload-pack=/tmp/helper"`` -> ``"upload-pack"``
++ ``"upload_pack"`` -> ``"upload-pack"``
++ ``"--config core.filemode=false"`` -> ``"config"``
++ """
++ option_name = option.lstrip("-").split("=", 1)[0]
++ option_tokens = option_name.split(None, 1)
++ if not option_tokens:
++ return ""
++ return dashify(option_tokens[0])
+
+ @classmethod
+ def check_unsafe_options(cls, options: List[str], unsafe_options: List[str]) -> None:
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 bfbdd80289..f7388e2bbb 100644
--- a/meta/recipes-devtools/python/python3-git_3.1.43.bb
+++ b/meta/recipes-devtools/python/python3-git_3.1.43.bb
@@ -13,6 +13,9 @@ PYPI_PACKAGE = "GitPython"
inherit pypi python_setuptools_build_meta
SRC_URI += "file://CVE-2026-42284.patch \
+ file://CVE-2026-42215_p1.patch \
+ file://CVE-2026-42215_p2.patch \
+ file://CVE-2026-42215_p3.patch \
"
SRC_URI[sha256sum] = "35f314a9f878467f5453cc1fee295c3e18e52f1b99f10f6cf5b1682e968a9e7c"
--
2.35.6
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [OE-core][wrynose][PATCH 2/4] python3-git: fix CVE-2026-42215
2026-08-19 5:08 ` [OE-core][wrynose][PATCH 2/4] python3-git: fix CVE-2026-42215 Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
@ 2026-09-02 13:01 ` Yoann Congal
2026-09-04 9:46 ` [wrynose][PATCH " Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
0 siblings, 1 reply; 6+ messages in thread
From: Yoann Congal @ 2026-09-02 13:01 UTC (permalink / raw)
To: dkelaiya, openembedded-core; +Cc: xe-linux-external
On Wed Aug 19, 2026 at 7:08 AM CEST, Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco) via lists.openembedded.org wrote:
> From: Darsh Kelaiya <dkelaiya@cisco.com>
>
> This patch applies the upstream fix as referenced in [4], using all the
> backported commits shown in [1], [2], and [3].
>
> [1] https://github.com/gitpython-developers/GitPython/commit/142195888e713542189533a52cdfc333f05c3af6
> [2] https://github.com/gitpython-developers/GitPython/commit/9aed7cf8c20f69effcfcf7ebef09f312f73ab826
> [3] https://github.com/gitpython-developers/GitPython/commit/43d92dec4683568d11495956dd556161f17c3ea8
> [4] https://github.com/gitpython-developers/GitPython/security/advisories/GHSA-rpm5-65cw-6hj4
>
> Signed-off-by: Darsh Kelaiya <dkelaiya@cisco.com>
> ---
> .../python3-git/CVE-2026-42215_p1.patch | 60 +++++++++++++++++++
> .../python3-git/CVE-2026-42215_p2.patch | 29 +++++++++
> .../python3-git/CVE-2026-42215_p3.patch | 45 ++++++++++++++
> .../python/python3-git_3.1.43.bb | 3 +
> 4 files changed, 137 insertions(+)
> create mode 100644 meta/recipes-devtools/python/python3-git/CVE-2026-42215_p1.patch
> create mode 100644 meta/recipes-devtools/python/python3-git/CVE-2026-42215_p2.patch
> create mode 100644 meta/recipes-devtools/python/python3-git/CVE-2026-42215_p3.patch
>
> diff --git a/meta/recipes-devtools/python/python3-git/CVE-2026-42215_p1.patch b/meta/recipes-devtools/python/python3-git/CVE-2026-42215_p1.patch
> new file mode 100644
> index 0000000000..0129250fdf
> --- /dev/null
> +++ b/meta/recipes-devtools/python/python3-git/CVE-2026-42215_p1.patch
> @@ -0,0 +1,60 @@
> +From dd5d1c4ddcc5d44faf4e71bcfa338f09db2022d6 Mon Sep 17 00:00:00 2001
> +From: w <w@mac.lan>
> +Date: Mon, 20 Apr 2026 23:29:50 -0400
> +Subject: [PATCH] Block unsafe underscored git kwargs / Fix for
> + GHSA-rpm5-65cw-6hj4
> +
> +CVE: CVE-2026-42215
> +Upstream-Status: Backport [https://github.com/gitpython-developers/GitPython/commit/142195888e713542189533a52cdfc333f05c3af6]
> +
> +Backport Changes:
> +- Omitted test/test_clone.py, test/test_git.py, and
> + test/test_remote.py because the PyPI 3.1.43 source used by the
> + recipe does not ship the upstream test tree.
> +
> +(cherry picked from commit 142195888e713542189533a52cdfc333f05c3af6)
> +Signed-off-by: Darsh Kelaiya <dkelaiya@cisco.com>
> +---
> + git/cmd.py | 21 +++++++++++++--------
> + 1 file changed, 13 insertions(+), 8 deletions(-)
> +
> [...]
> diff --git a/meta/recipes-devtools/python/python3-git/CVE-2026-42215_p2.patch b/meta/recipes-devtools/python/python3-git/CVE-2026-42215_p2.patch
> new file mode 100644
> index 0000000000..4326bede07
> --- /dev/null
> +++ b/meta/recipes-devtools/python/python3-git/CVE-2026-42215_p2.patch
> @@ -0,0 +1,29 @@
> +From e77461e6953a67f17ecd1808c352e6613a17345b Mon Sep 17 00:00:00 2001
> +From: w <w@mac.lan>
> +Date: Mon, 20 Apr 2026 23:43:59 -0400
> +Subject: [PATCH] linter fix
> +
> +CVE: CVE-2026-42215
> +Upstream-Status: Backport [https://github.com/gitpython-developers/GitPython/commit/9aed7cf8c20f69effcfcf7ebef09f312f73ab826]
> +
> +(cherry picked from commit 9aed7cf8c20f69effcfcf7ebef09f312f73ab826)
> +Signed-off-by: Darsh Kelaiya <dkelaiya@cisco.com>
> +---
> + git/cmd.py | 4 +---
> + 1 file changed, 1 insertion(+), 3 deletions(-)
> +
> +diff --git a/git/cmd.py b/git/cmd.py
> +index 2ecb8e66..372eac28 100644
> +--- a/git/cmd.py
> ++++ b/git/cmd.py
> +@@ -729,9 +729,7 @@ class Git(metaclass=_GitMeta):
> + for option in options:
> + unsafe_option = canonical_unsafe_options.get(cls._canonicalize_option_name(option))
> + if unsafe_option is not None:
> +- raise UnsafeOptionError(
> +- f"{unsafe_option} is not allowed, use `allow_unsafe_options=True` to allow it."
> +- )
> ++ raise UnsafeOptionError(f"{unsafe_option} is not allowed, use `allow_unsafe_options=True` to allow it.")
> +
> + class AutoInterrupt:
> + """Process wrapper that terminates the wrapped process on finalization.
Hello,
I don't think we need this "linter fix" _p2 patch. If that works, can you
send a v2 without it?
Same for the scarthgap patch.
Thanks!
--
Yoann Congal
Smile ECS
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [wrynose][PATCH 2/4] python3-git: fix CVE-2026-42215
2026-09-02 13:01 ` Yoann Congal
@ 2026-09-04 9:46 ` Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
0 siblings, 0 replies; 6+ messages in thread
From: Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco) @ 2026-09-04 9:46 UTC (permalink / raw)
To: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 4783 bytes --]
On Wed, Sep 2, 2026 at 06:31 PM, Yoann Congal wrote:
>
> On Wed Aug 19, 2026 at 7:08 AM CEST, Darsh Kelaiya -X (dkelaiya - E
> INFOCHIPS PRIVATE LIMITED at Cisco) via lists.openembedded.org wrote:
>
>> From: Darsh Kelaiya <dkelaiya@cisco.com>
>>
>> This patch applies the upstream fix as referenced in [4], using all the
>> backported commits shown in [1], [2], and [3].
>>
>> [1] https://github.com/gitpython-developers/GitPython/commit/142195888e713542189533a52cdfc333f05c3af6
>>
>> [2] https://github.com/gitpython-developers/GitPython/commit/9aed7cf8c20f69effcfcf7ebef09f312f73ab826
>>
>> [3] https://github.com/gitpython-developers/GitPython/commit/43d92dec4683568d11495956dd556161f17c3ea8
>>
>> [4] https://github.com/gitpython-developers/GitPython/security/advisories/GHSA-rpm5-65cw-6hj4
>>
>>
>> Signed-off-by: Darsh Kelaiya <dkelaiya@cisco.com>
>> ---
>> .../python3-git/CVE-2026-42215_p1.patch | 60 +++++++++++++++++++
>> .../python3-git/CVE-2026-42215_p2.patch | 29 +++++++++
>> .../python3-git/CVE-2026-42215_p3.patch | 45 ++++++++++++++
>> .../python/python3-git_3.1.43.bb | 3 +
>> 4 files changed, 137 insertions(+)
>> create mode 100644
>> meta/recipes-devtools/python/python3-git/CVE-2026-42215_p1.patch
>> create mode 100644
>> meta/recipes-devtools/python/python3-git/CVE-2026-42215_p2.patch
>> create mode 100644
>> meta/recipes-devtools/python/python3-git/CVE-2026-42215_p3.patch
>>
>> diff --git
>> a/meta/recipes-devtools/python/python3-git/CVE-2026-42215_p1.patch
>> b/meta/recipes-devtools/python/python3-git/CVE-2026-42215_p1.patch
>> new file mode 100644
>> index 0000000000..0129250fdf
>> --- /dev/null
>> +++ b/meta/recipes-devtools/python/python3-git/CVE-2026-42215_p1.patch
>> @@ -0,0 +1,60 @@
>> +From dd5d1c4ddcc5d44faf4e71bcfa338f09db2022d6 Mon Sep 17 00:00:00 2001
>> +From: w <w@mac.lan>
>> +Date: Mon, 20 Apr 2026 23:29:50 -0400
>> +Subject: [PATCH] Block unsafe underscored git kwargs / Fix for
>> + GHSA-rpm5-65cw-6hj4
>> +
>> +CVE: CVE-2026-42215
>> +Upstream-Status: Backport [ https://github.com/gitpython-developers/GitPython/commit/142195888e713542189533a52cdfc333f05c3af6
>> ]
>> +
>> +Backport Changes:
>> +- Omitted test/test_clone.py, test/test_git.py, and
>> + test/test_remote.py because the PyPI 3.1.43 source used by the
>> + recipe does not ship the upstream test tree.
>> +
>> +(cherry picked from commit 142195888e713542189533a52cdfc333f05c3af6)
>> +Signed-off-by: Darsh Kelaiya <dkelaiya@cisco.com>
>> +---
>> + git/cmd.py | 21 +++++++++++++--------
>> + 1 file changed, 13 insertions(+), 8 deletions(-)
>> +
>> [...]
>> diff --git
>> a/meta/recipes-devtools/python/python3-git/CVE-2026-42215_p2.patch
>> b/meta/recipes-devtools/python/python3-git/CVE-2026-42215_p2.patch
>> new file mode 100644
>> index 0000000000..4326bede07
>> --- /dev/null
>> +++ b/meta/recipes-devtools/python/python3-git/CVE-2026-42215_p2.patch
>> @@ -0,0 +1,29 @@
>> +From e77461e6953a67f17ecd1808c352e6613a17345b Mon Sep 17 00:00:00 2001
>> +From: w <w@mac.lan>
>> +Date: Mon, 20 Apr 2026 23:43:59 -0400
>> +Subject: [PATCH] linter fix
>> +
>> +CVE: CVE-2026-42215
>> +Upstream-Status: Backport [ https://github.com/gitpython-developers/GitPython/commit/9aed7cf8c20f69effcfcf7ebef09f312f73ab826
>> ]
>> +
>> +(cherry picked from commit 9aed7cf8c20f69effcfcf7ebef09f312f73ab826)
>> +Signed-off-by: Darsh Kelaiya <dkelaiya@cisco.com>
>> +---
>> + git/cmd.py | 4 +---
>> + 1 file changed, 1 insertion(+), 3 deletions(-)
>> +
>> +diff --git a/git/cmd.py b/git/cmd.py
>> +index 2ecb8e66..372eac28 100644
>> +--- a/git/cmd.py
>> ++++ b/git/cmd.py
>> +@@ -729,9 +729,7 @@ class Git(metaclass=_GitMeta):
>> + for option in options:
>> + unsafe_option =
>> canonical_unsafe_options.get(cls._canonicalize_option_name(option))
>> + if unsafe_option is not None:
>> +- raise UnsafeOptionError(
>> +- f"{unsafe_option} is not allowed, use `allow_unsafe_options=True` to
>> allow it."
>> +- )
>> ++ raise UnsafeOptionError(f"{unsafe_option} is not allowed, use
>> `allow_unsafe_options=True` to allow it.")
>> +
>> + class AutoInterrupt:
>> + """Process wrapper that terminates the wrapped process on finalization.
>
> Hello,
>
> I don't think we need this "linter fix" _p2 patch. If that works, can you
> send a v2 without it?
>
> Same for the scarthgap patch.
>
> Thanks!
> --
> Yoann Congal
> Smile ECS
Hi Yoann,
Thanks for the review.
I've sent v2 patches for Wrynose [1] and Scarthgap [2] as requested.
[1] https://lists.openembedded.org/g/openembedded-core/topic/wrynose_patch_v2_2_4/121083416
[2] https://lists.openembedded.org/g/openembedded-core/topic/scarthgap_patch_v2_2_4/121083408
Regards,
Darsh Kelaiya
[-- Attachment #2: Type: text/html, Size: 6063 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [OE-core][wrynose][PATCH 3/4] python3-git: fix CVE-2026-44243
2026-08-19 5:08 [OE-core][wrynose][PATCH 1/4] python3-git: fix CVE-2026-42284 Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-08-19 5:08 ` [OE-core][wrynose][PATCH 2/4] python3-git: fix CVE-2026-42215 Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
@ 2026-08-19 5:08 ` Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-08-19 5:08 ` [OE-core][wrynose][PATCH 4/4] python3-git: fix CVE-2026-44244 Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
2 siblings, 0 replies; 6+ messages in thread
From: Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco) @ 2026-08-19 5:08 UTC (permalink / raw)
To: openembedded-core; +Cc: xe-linux-external, Darsh Kelaiya
From: Darsh Kelaiya <dkelaiya@cisco.com>
This patch applies the upstream fix as referenced in [3], using all the
backported commits shown in [1] and [2].
[1] https://github.com/gitpython-developers/GitPython/commit/25ba54dd3fb374b8fade7de4be1ac2ac84722190
[2] https://github.com/gitpython-developers/GitPython/commit/4af8463cca31c2369312fcaa5309dfc30756c7b6
[3] https://github.com/gitpython-developers/GitPython/security/advisories/GHSA-7545-fcxq-7j24
Signed-off-by: Darsh Kelaiya <dkelaiya@cisco.com>
---
.../python3-git/CVE-2026-44243_p1.patch | 134 ++++++++++++++++++
.../python3-git/CVE-2026-44243_p2.patch | 83 +++++++++++
.../python/python3-git_3.1.43.bb | 2 +
3 files changed, 219 insertions(+)
create mode 100644 meta/recipes-devtools/python/python3-git/CVE-2026-44243_p1.patch
create mode 100644 meta/recipes-devtools/python/python3-git/CVE-2026-44243_p2.patch
diff --git a/meta/recipes-devtools/python/python3-git/CVE-2026-44243_p1.patch b/meta/recipes-devtools/python/python3-git/CVE-2026-44243_p1.patch
new file mode 100644
index 0000000000..7eaaf703db
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-git/CVE-2026-44243_p1.patch
@@ -0,0 +1,134 @@
+From 84b84e90d1ce0b35d627bee6c65f3218c72a53f5 Mon Sep 17 00:00:00 2001
+From: "GPT 5.5" <codex@openai.com>
+Date: Tue, 28 Apr 2026 09:17:31 +0800
+Subject: [PATCH] prevent out-of-repo access when manipulating references.
+
+This previously made it possible to create, modify and delete files outside outside
+of the repository, which is a problem if inputs aren't trusted.
+
+CVE: CVE-2026-44243
+Upstream-Status: Backport [https://github.com/gitpython-developers/GitPython/commit/25ba54dd3fb374b8fade7de4be1ac2ac84722190]
+
+Backport Changes:
+- Omitted test/test_refs.py because the PyPI 3.1.43 source used by
+ the recipe does not ship the upstream test tree.
+
+Co-authored-by: Sebastian Thiel <sebastian.thiel@icloud.com>
+(cherry picked from commit 25ba54dd3fb374b8fade7de4be1ac2ac84722190)
+Signed-off-by: Darsh Kelaiya <dkelaiya@cisco.com>
+---
+ git/refs/log.py | 2 +-
+ git/refs/remote.py | 5 +++--
+ git/refs/symbolic.py | 37 +++++++++++++++++++++++++++++++------
+ 3 files changed, 35 insertions(+), 9 deletions(-)
+
+diff --git a/git/refs/log.py b/git/refs/log.py
+index 17e3a94b..88906758 100644
+--- a/git/refs/log.py
++++ b/git/refs/log.py
+@@ -213,7 +213,7 @@ class RefLog(List[RefLogEntry], Serializable):
+ :param ref:
+ :class:`~git.refs.symbolic.SymbolicReference` instance
+ """
+- return osp.join(ref.repo.git_dir, "logs", to_native_path(ref.path))
++ return to_native_path(ref._get_validated_reflog_path(ref.repo, ref.path))
+
+ @classmethod
+ def iter_entries(cls, stream: Union[str, "BytesIO", mmap]) -> Iterator[RefLogEntry]:
+diff --git a/git/refs/remote.py b/git/refs/remote.py
+index b4f4f7b3..8244470b 100644
+--- a/git/refs/remote.py
++++ b/git/refs/remote.py
+@@ -63,12 +63,13 @@ class RemoteReference(Head):
+ # generally ignored in the refs/ folder. We don't though and delete remainders
+ # manually.
+ for ref in refs:
++ cls._check_ref_name_valid(ref.path)
+ try:
+- os.remove(os.path.join(repo.common_dir, ref.path))
++ os.remove(cls._get_validated_path(repo.common_dir, ref.path))
+ except OSError:
+ pass
+ try:
+- os.remove(os.path.join(repo.git_dir, ref.path))
++ os.remove(cls._get_validated_path(repo.git_dir, ref.path))
+ except OSError:
+ pass
+ # END for each ref
+diff --git a/git/refs/symbolic.py b/git/refs/symbolic.py
+index 510850b2..ba24f2c2 100644
+--- a/git/refs/symbolic.py
++++ b/git/refs/symbolic.py
+@@ -109,6 +109,32 @@ class SymbolicReference:
+ def abspath(self) -> PathLike:
+ return join_path_native(_git_dir(self.repo, self.path), self.path)
+
++ @staticmethod
++ def _get_validated_path(base: PathLike, path: PathLike) -> str:
++ path = os.fspath(path)
++ base_path = os.path.realpath(os.fspath(base))
++ abs_path = os.path.realpath(os.path.join(base_path, path))
++ try:
++ common_path = os.path.commonpath([base_path, abs_path])
++ except ValueError as e:
++ raise ValueError("Reference path %r escapes the repository" % path) from e
++ if os.path.normcase(common_path) != os.path.normcase(base_path):
++ raise ValueError("Reference path %r escapes the repository" % path)
++ return abs_path
++
++ @classmethod
++ def _get_validated_ref_path(cls, repo: "Repo", path: PathLike) -> str:
++ """Return the absolute filesystem path for a ref after validating it."""
++ cls._check_ref_name_valid(path)
++ ref_path = os.fspath(path)
++ return cls._get_validated_path(_git_dir(repo, ref_path), ref_path)
++
++ @classmethod
++ def _get_validated_reflog_path(cls, repo: "Repo", path: PathLike) -> str:
++ """Return the absolute filesystem path for a reflog after validating it."""
++ cls._check_ref_name_valid(path)
++ return cls._get_validated_path(os.path.join(repo.git_dir, "logs"), path)
++
+ @classmethod
+ def _get_packed_refs_path(cls, repo: "Repo") -> str:
+ return os.path.join(repo.common_dir, "packed-refs")
+@@ -478,7 +504,7 @@ class SymbolicReference:
+ # END handle non-existing
+ # END retrieve old hexsha
+
+- fpath = self.abspath
++ fpath = self._get_validated_ref_path(self.repo, self.path)
+ assure_directory_exists(fpath, is_file=True)
+
+ lfd = LockedFD(fpath)
+@@ -623,7 +649,7 @@ class SymbolicReference:
+ Alternatively the symbolic reference to be deleted.
+ """
+ full_ref_path = cls.to_full_path(path)
+- abs_path = os.path.join(repo.common_dir, full_ref_path)
++ abs_path = cls._get_validated_ref_path(repo, full_ref_path)
+ if os.path.exists(abs_path):
+ os.remove(abs_path)
+ else:
+@@ -686,9 +712,8 @@ class SymbolicReference:
+ symbolic reference. Otherwise it will be resolved to the corresponding object
+ and a detached symbolic reference will be created instead.
+ """
+- git_dir = _git_dir(repo, path)
+ full_ref_path = cls.to_full_path(path)
+- abs_ref_path = os.path.join(git_dir, full_ref_path)
++ abs_ref_path = cls._get_validated_ref_path(repo, full_ref_path)
+
+ # Figure out target data.
+ target = reference
+@@ -780,8 +805,8 @@ class SymbolicReference:
+ if self.path == new_path:
+ return self
+
+- new_abs_path = os.path.join(_git_dir(self.repo, new_path), new_path)
+- cur_abs_path = os.path.join(_git_dir(self.repo, self.path), self.path)
++ new_abs_path = self._get_validated_ref_path(self.repo, new_path)
++ cur_abs_path = self._get_validated_ref_path(self.repo, self.path)
+ if os.path.isfile(new_abs_path):
+ if not force:
+ # If they point to the same file, it's not an error.
diff --git a/meta/recipes-devtools/python/python3-git/CVE-2026-44243_p2.patch b/meta/recipes-devtools/python/python3-git/CVE-2026-44243_p2.patch
new file mode 100644
index 0000000000..04e83d3657
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-git/CVE-2026-44243_p2.patch
@@ -0,0 +1,83 @@
+From 4ab42809cb34222b1c574c07e083a4008e97d8de Mon Sep 17 00:00:00 2001
+From: "GPT 5.5" <codex@openai.com>
+Date: Tue, 28 Apr 2026 09:30:41 +0800
+Subject: [PATCH] address review feedback and CI failures
+
+Consolidate follow-up fixes from review and CI:
+
+- fix lint and mypy issues in reference log path handling
+- validate remote reference paths before invoking git branch deletion
+- add symlink escape coverage where realpath resolves symlinks
+- ensure temporary test repositories release git resources during cleanup
+
+CVE: CVE-2026-44243
+Upstream-Status: Backport [https://github.com/gitpython-developers/GitPython/commit/4af8463cca31c2369312fcaa5309dfc30756c7b6]
+
+Backport Changes:
+- Omitted test/test_refs.py because the PyPI 3.1.43 source used by
+ the recipe does not ship the upstream test tree.
+
+Co-authored-by: Sebastian Thiel <sebastian.thiel@icloud.com>
+(cherry picked from commit 4af8463cca31c2369312fcaa5309dfc30756c7b6)
+Signed-off-by: Darsh Kelaiya <dkelaiya@cisco.com>
+---
+ git/refs/log.py | 4 +++-
+ git/refs/remote.py | 4 +++-
+ git/util.py | 2 +-
+ 3 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/git/refs/log.py b/git/refs/log.py
+index 88906758..642b1825 100644
+--- a/git/refs/log.py
++++ b/git/refs/log.py
+@@ -4,7 +4,6 @@
+ __all__ = ["RefLog", "RefLogEntry"]
+
+ from mmap import mmap
+-import os.path as osp
+ import re
+ import time as _time
+
+@@ -212,6 +211,9 @@ class RefLog(List[RefLogEntry], Serializable):
+
+ :param ref:
+ :class:`~git.refs.symbolic.SymbolicReference` instance
++
++ :raise ValueError:
++ If `ref.path` is invalid or escapes the repository's reflog directory.
+ """
+ return to_native_path(ref._get_validated_reflog_path(ref.repo, ref.path))
+
+diff --git a/git/refs/remote.py b/git/refs/remote.py
+index 8244470b..e16ae70f 100644
+--- a/git/refs/remote.py
++++ b/git/refs/remote.py
+@@ -58,12 +58,14 @@ class RemoteReference(Head):
+ `kwargs` are given for comparability with the base class method as we
+ should not narrow the signature.
+ """
++ for ref in refs:
++ cls._check_ref_name_valid(ref.path)
++
+ repo.git.branch("-d", "-r", *refs)
+ # The official deletion method will ignore remote symbolic refs - these are
+ # generally ignored in the refs/ folder. We don't though and delete remainders
+ # manually.
+ for ref in refs:
+- cls._check_ref_name_valid(ref.path)
+ try:
+ os.remove(cls._get_validated_path(repo.common_dir, ref.path))
+ except OSError:
+diff --git a/git/util.py b/git/util.py
+index 8c1c2601..27b239ab 100644
+--- a/git/util.py
++++ b/git/util.py
+@@ -289,7 +289,7 @@ def join_path(a: PathLike, *p: PathLike) -> PathLike:
+
+ if sys.platform == "win32":
+
+- def to_native_path_windows(path: PathLike) -> PathLike:
++ def to_native_path_windows(path: PathLike) -> str:
+ path = str(path)
+ return path.replace("/", "\\")
+
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 f7388e2bbb..bd2b113489 100644
--- a/meta/recipes-devtools/python/python3-git_3.1.43.bb
+++ b/meta/recipes-devtools/python/python3-git_3.1.43.bb
@@ -16,6 +16,8 @@ SRC_URI += "file://CVE-2026-42284.patch \
file://CVE-2026-42215_p1.patch \
file://CVE-2026-42215_p2.patch \
file://CVE-2026-42215_p3.patch \
+ file://CVE-2026-44243_p1.patch \
+ file://CVE-2026-44243_p2.patch \
"
SRC_URI[sha256sum] = "35f314a9f878467f5453cc1fee295c3e18e52f1b99f10f6cf5b1682e968a9e7c"
--
2.35.6
^ permalink raw reply related [flat|nested] 6+ messages in thread* [OE-core][wrynose][PATCH 4/4] python3-git: fix CVE-2026-44244
2026-08-19 5:08 [OE-core][wrynose][PATCH 1/4] python3-git: fix CVE-2026-42284 Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-08-19 5:08 ` [OE-core][wrynose][PATCH 2/4] python3-git: fix CVE-2026-42215 Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
2026-08-19 5:08 ` [OE-core][wrynose][PATCH 3/4] python3-git: fix CVE-2026-44243 Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
@ 2026-08-19 5:08 ` Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco)
2 siblings, 0 replies; 6+ messages in thread
From: Darsh Kelaiya -X (dkelaiya - E INFOCHIPS PRIVATE LIMITED at Cisco) @ 2026-08-19 5:08 UTC (permalink / raw)
To: openembedded-core; +Cc: xe-linux-external, Darsh Kelaiya
From: Darsh Kelaiya <dkelaiya@cisco.com>
This patch applies the upstream fix as referenced in [3], using all the
backported commits shown in [1] and [2].
[1] https://github.com/gitpython-developers/GitPython/commit/c417af469f9aa3da8dfef78f996c0fb8c5d1f4c2
[2] https://github.com/gitpython-developers/GitPython/commit/8e24503b42c1d63dd98e8b2e6a2f655bdd0821e3
[3] https://github.com/gitpython-developers/GitPython/security/advisories/GHSA-v87r-6q3f-2j67
Signed-off-by: Darsh Kelaiya <dkelaiya@cisco.com>
---
.../python3-git/CVE-2026-44244_p1.patch | 102 ++++++++++++++++++
.../python3-git/CVE-2026-44244_p2.patch | 28 +++++
.../python/python3-git_3.1.43.bb | 2 +
3 files changed, 132 insertions(+)
create mode 100644 meta/recipes-devtools/python/python3-git/CVE-2026-44244_p1.patch
create mode 100644 meta/recipes-devtools/python/python3-git/CVE-2026-44244_p2.patch
diff --git a/meta/recipes-devtools/python/python3-git/CVE-2026-44244_p1.patch b/meta/recipes-devtools/python/python3-git/CVE-2026-44244_p1.patch
new file mode 100644
index 0000000000..66ba5e9697
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-git/CVE-2026-44244_p1.patch
@@ -0,0 +1,102 @@
+From 4ac5a1c848582f606655d03bfbc1243fe1754dc8 Mon Sep 17 00:00:00 2001
+From: "GPT 5.5" <codex@openai.com>
+Date: Wed, 29 Apr 2026 05:47:57 +0800
+Subject: [PATCH] reject control chars in written values in configuration
+
+Reject CR, LF, and NUL in GitConfigParser values before writing them
+to git config files (which also is a deviation from Git which escapes them).
+
+GitConfigParser._write() serializes embedded newlines as indented
+continuation lines by replacing "\n" with "\n\t". Git itself skips
+leading whitespace before parsing config tokens, so an injected value
+such as:
+
+ foo
+ [core]
+ hooksPath=/tmp/hooks
+
+is written in a form where the indented "[core]" line is still parsed by
+Git as a real section header. This lets attacker-controlled input passed
+to config_writer().set_value() poison repository config, including
+core.hooksPath, and redirect hook execution for later Git operations.
+
+Fail closed instead of stripping or normalizing these characters. Silent
+normalization can hide unsanitized caller input, and GitPython does not
+currently round-trip Git-style escaped values such as "\n" as embedded
+newlines.
+
+Apply the validation to set_value(), add_value(), and the public set()
+path so callers cannot bypass the safer helper API. Add regression tests
+for the advisory payload and for CR, LF, NUL, and bytes values.
+
+This preserves existing read behavior for config files that already
+contain multiline values while preventing GitPython from writing new
+unsafe values.
+
+CVE: CVE-2026-44244
+Upstream-Status: Backport [https://github.com/gitpython-developers/GitPython/commit/c417af469f9aa3da8dfef78f996c0fb8c5d1f4c2]
+
+Backport Changes:
+- Omitted test/test_config.py because the PyPI 3.1.43 source used
+ by the recipe does not ship the upstream test tree.
+
+Co-authored-by: Sebastian Thiel <sebastian.thiel@icloud.com>
+(cherry picked from commit c417af469f9aa3da8dfef78f996c0fb8c5d1f4c2)
+Signed-off-by: Darsh Kelaiya <dkelaiya@cisco.com>
+---
+ git/config.py | 24 ++++++++++++++++++++++--
+ 1 file changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/git/config.py b/git/config.py
+index 3ce9b123..d45cc31b 100644
+--- a/git/config.py
++++ b/git/config.py
+@@ -863,6 +863,24 @@ class GitConfigParser(cp.RawConfigParser, metaclass=MetaParserBuilder):
+ return str(value)
+ return force_text(value)
+
++ 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):
++ raise ValueError("Git config values must not contain CR, LF, or NUL")
++ return value_str
++
++ @needs_values
++ @set_dirty_and_flush_changes
++ def set(
++ self,
++ section: str,
++ option: str,
++ value: Union[str, bytes, int, float, bool, None] = None,
++ ) -> None:
++ if value is not None:
++ value = self._value_to_string_safe(value)
++ return super().set(section, option, value)
++
+ @needs_values
+ @set_dirty_and_flush_changes
+ def set_value(self, section: str, option: str, value: Union[str, bytes, int, float, bool]) -> "GitConfigParser":
+@@ -883,9 +901,10 @@ class GitConfigParser(cp.RawConfigParser, metaclass=MetaParserBuilder):
+ :return:
+ This instance
+ """
++ value_str = self._value_to_string_safe(value)
+ if not self.has_section(section):
+ self.add_section(section)
+- self.set(section, option, self._value_to_string(value))
++ self.set(section, option, value_str)
+ return self
+
+ @needs_values
+@@ -910,9 +929,10 @@ class GitConfigParser(cp.RawConfigParser, metaclass=MetaParserBuilder):
+ :return:
+ This instance
+ """
++ value_str = self._value_to_string_safe(value)
+ if not self.has_section(section):
+ self.add_section(section)
+- self._sections[section].add(option, self._value_to_string(value))
++ self._sections[section].add(option, value_str)
+ return self
+
+ def rename_section(self, section: str, new_name: str) -> "GitConfigParser":
diff --git a/meta/recipes-devtools/python/python3-git/CVE-2026-44244_p2.patch b/meta/recipes-devtools/python/python3-git/CVE-2026-44244_p2.patch
new file mode 100644
index 0000000000..43aea2fd56
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-git/CVE-2026-44244_p2.patch
@@ -0,0 +1,28 @@
+From cfa5a26453544e93be3689101e710b6b07a6e2b0 Mon Sep 17 00:00:00 2001
+From: "GPT 5.5" <codex@openai.com>
+Date: Wed, 29 Apr 2026 06:39:02 +0800
+Subject: [PATCH] avoid duplicate validation in set_value
+
+CVE: CVE-2026-44244
+Upstream-Status: Backport [https://github.com/gitpython-developers/GitPython/commit/8e24503b42c1d63dd98e8b2e6a2f655bdd0821e3]
+
+Co-authored-by: Sebastian Thiel <sebastian.thiel@icloud.com>
+(cherry picked from commit 8e24503b42c1d63dd98e8b2e6a2f655bdd0821e3)
+Signed-off-by: Darsh Kelaiya <dkelaiya@cisco.com>
+---
+ git/config.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/git/config.py b/git/config.py
+index d45cc31b..1595d51f 100644
+--- a/git/config.py
++++ b/git/config.py
+@@ -904,7 +904,7 @@ class GitConfigParser(cp.RawConfigParser, metaclass=MetaParserBuilder):
+ value_str = self._value_to_string_safe(value)
+ if not self.has_section(section):
+ self.add_section(section)
+- self.set(section, option, value_str)
++ super().set(section, option, value_str)
+ return self
+
+ @needs_values
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 bd2b113489..d572857747 100644
--- a/meta/recipes-devtools/python/python3-git_3.1.43.bb
+++ b/meta/recipes-devtools/python/python3-git_3.1.43.bb
@@ -18,6 +18,8 @@ SRC_URI += "file://CVE-2026-42284.patch \
file://CVE-2026-42215_p3.patch \
file://CVE-2026-44243_p1.patch \
file://CVE-2026-44243_p2.patch \
+ file://CVE-2026-44244_p1.patch \
+ file://CVE-2026-44244_p2.patch \
"
SRC_URI[sha256sum] = "35f314a9f878467f5453cc1fee295c3e18e52f1b99f10f6cf5b1682e968a9e7c"
--
2.35.6
^ permalink raw reply related [flat|nested] 6+ messages in thread