mirror of
git://git.yoctoproject.org/poky
synced 2026-05-06 16:12:01 +00:00
c18ab4d895
Backport patch to fix CVE-2026-24049 per reference [1] [2]. [1] https://security-tracker.debian.org/tracker/CVE-2026-24049 [2] https://github.com/pypa/wheel/commit/7a7d2de96b (From OE-Core rev: aa7465ce6a3d82629abeaa9b6d199b465b449d43) Signed-off-by: Guocai He <guocai.he.cn@windriver.com> Signed-off-by: Jinfeng Wang <jinfeng.wang.cn@windriver.com> Signed-off-by: Yoann Congal <yoann.congal@smile.fr> Signed-off-by: Paul Barker <paul@pbarker.dev>
74 lines
2.8 KiB
Diff
74 lines
2.8 KiB
Diff
From 363aef740d670c37d76b6fd86e2a28886de23f45 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
|
|
Date: Thu, 22 Jan 2026 01:41:14 +0200
|
|
Subject: [PATCH] Fixed security issue around wheel unpack (#675)
|
|
|
|
A maliciously crafted wheel could cause the permissions of a file outside the unpack tree to be altered.
|
|
|
|
Fixes CVE-2026-24049.
|
|
|
|
CVE: CVE-2026-24049
|
|
|
|
In test case, the API "run_command" is not defined and use "unpack" directly.
|
|
|
|
Upstream-Status: Backport [https://github.com/pypa/wheel/commit/7a7d2de96b]
|
|
|
|
Signed-off-by: Guocai He <guocai.he.cn@windriver.com>
|
|
---
|
|
src/wheel/cli/unpack.py | 4 ++--
|
|
tests/cli/test_unpack.py | 22 ++++++++++++++++++++++
|
|
2 files changed, 24 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/wheel/cli/unpack.py b/src/wheel/cli/unpack.py
|
|
index d48840e..83dc742 100644
|
|
--- a/src/wheel/cli/unpack.py
|
|
+++ b/src/wheel/cli/unpack.py
|
|
@@ -19,12 +19,12 @@ def unpack(path: str, dest: str = ".") -> None:
|
|
destination = Path(dest) / namever
|
|
print(f"Unpacking to: {destination}...", end="", flush=True)
|
|
for zinfo in wf.filelist:
|
|
- wf.extract(zinfo, destination)
|
|
+ target_path = Path(wf.extract(zinfo, destination))
|
|
|
|
# Set permissions to the same values as they were set in the archive
|
|
# We have to do this manually due to
|
|
# https://github.com/python/cpython/issues/59999
|
|
permissions = zinfo.external_attr >> 16 & 0o777
|
|
- destination.joinpath(zinfo.filename).chmod(permissions)
|
|
+ target_path.chmod(permissions)
|
|
|
|
print("OK")
|
|
diff --git a/tests/cli/test_unpack.py b/tests/cli/test_unpack.py
|
|
index ae584af..96d1391 100644
|
|
--- a/tests/cli/test_unpack.py
|
|
+++ b/tests/cli/test_unpack.py
|
|
@@ -34,3 +34,25 @@ def test_unpack_executable_bit(tmp_path):
|
|
unpack(str(wheel_path), str(tmp_path))
|
|
assert not script_path.is_dir()
|
|
assert stat.S_IMODE(script_path.stat().st_mode) == 0o755
|
|
+
|
|
+@pytest.mark.skipif(
|
|
+ platform.system() == "Windows", reason="Windows does not support chmod()"
|
|
+)
|
|
+def test_chmod_outside_unpack_tree(tmp_path_factory: TempPathFactory) -> None:
|
|
+ wheel_path = tmp_path_factory.mktemp("build") / "test-1.0-py3-none-any.whl"
|
|
+ with WheelFile(wheel_path, "w") as wf:
|
|
+ wf.writestr(
|
|
+ "test-1.0.dist-info/METADATA",
|
|
+ "Metadata-Version: 2.4\nName: test\nVersion: 1.0\n",
|
|
+ )
|
|
+ wf.writestr("../../system-file", b"malicious data")
|
|
+
|
|
+ extract_root_path = tmp_path_factory.mktemp("extract")
|
|
+ system_file = extract_root_path / "system-file"
|
|
+ extract_path = extract_root_path / "subdir"
|
|
+ system_file.write_bytes(b"important data")
|
|
+ system_file.chmod(0o755)
|
|
+ unpack(str(wheel_path), str(extract_path))
|
|
+
|
|
+ assert system_file.read_bytes() == b"important data"
|
|
+ assert stat.S_IMODE(system_file.stat().st_mode) == 0o755
|
|
--
|
|
2.34.1
|
|
|