Skip to content

Commit fd36d26

Browse files
Narpat Malirpurdie
Narpat Mali
authored andcommitted
python3-wheel: fix for CVE-2022-40898
An issue discovered in Python Packaging Authority (PyPA) Wheel 0.37.1 and earlier allows remote attackers to cause a denial of service via attacker controlled input to wheel cli. CVE: CVE-2022-40898 Upstream-Status: Backport [pypa/wheel@88f02bc] (From OE-Core rev: 0974291e545aec68755dfb634c75dca37cca1ea9) Signed-off-by: Narpat Mali <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
1 parent 92b150b commit fd36d26

File tree

2 files changed

+35
-1
lines changed

2 files changed

+35
-1
lines changed
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
From a9a0d67a663f20b69903751c23851dd4cd6b49d4 Mon Sep 17 00:00:00 2001
2+
From: Narpat Mali <[email protected]>
3+
Date: Wed, 11 Jan 2023 07:45:57 +0000
4+
Subject: [PATCH] Fixed potential DoS attack via WHEEL_INFO_RE
5+
6+
CVE: CVE-2022-40898
7+
8+
Upstream-Status: Backport [https://github.com/pypa/wheel/commit/88f02bc335d5404991e532e7f3b0fc80437bf4e0]
9+
10+
Signed-off-by: Narpat Mali <[email protected]>
11+
---
12+
src/wheel/wheelfile.py | 4 ++--
13+
1 file changed, 2 insertions(+), 2 deletions(-)
14+
15+
diff --git a/src/wheel/wheelfile.py b/src/wheel/wheelfile.py
16+
index 21e7361..ff06edf 100644
17+
--- a/src/wheel/wheelfile.py
18+
+++ b/src/wheel/wheelfile.py
19+
@@ -27,8 +27,8 @@ else:
20+
# Non-greedy matching of an optional build number may be too clever (more
21+
# invalid wheel filenames will match). Separate regex for .dist-info?
22+
WHEEL_INFO_RE = re.compile(
23+
- r"""^(?P<namever>(?P<name>.+?)-(?P<ver>.+?))(-(?P<build>\d[^-]*))?
24+
- -(?P<pyver>.+?)-(?P<abi>.+?)-(?P<plat>.+?)\.whl$""",
25+
+ r"""^(?P<namever>(?P<name>[^-]+?)-(?P<ver>[^-]+?))(-(?P<build>\d[^-]*))?
26+
+ -(?P<pyver>[^-]+?)-(?P<abi>[^-]+?)-(?P<plat>[^.]+?)\.whl$""",
27+
re.VERBOSE)
28+
29+
30+
--
31+
2.32.0
32+

meta/recipes-devtools/python/python3-wheel_0.37.1.bb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ SRC_URI[sha256sum] = "e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d495
88

99
inherit python_flit_core pypi
1010

11-
SRC_URI += " file://0001-Backport-pyproject.toml-from-flit-backend-branch.patch"
11+
SRC_URI += "file://0001-Backport-pyproject.toml-from-flit-backend-branch.patch \
12+
file://0001-Fixed-potential-DoS-attack-via-WHEEL_INFO_RE.patch \
13+
"
1214

1315
BBCLASSEXTEND = "native nativesdk"
1416

0 commit comments

Comments
 (0)