mirror of
https://git.yoctoproject.org/git/poky
synced 2026-01-01 13:58:04 +00:00
python3: Treat UID/GID overflow as failure
This fixes ptest failures on 32bit architectures
AssertionError:
Failed ptests:
{'python3': ['test_extractall_none_gid',
'test_extractall_none_gname',
'test_extractall_none_mode',
'test_extractall_none_mtime',
'test_extractall_none_uid',
'test_extractall_none_uname',
'setUpClass',
'python3']}
(From OE-Core rev: 838f3cff2a123fb7d5833b6760772ded6efb60bd)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 43104b547cb79693c83df0882773ae8dd74b1d35)
Signed-off-by: Haixiao Yan <haixiao.yan.cn@windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
parent
70b5e37d0d
commit
bd51ce99cb
|
|
@ -0,0 +1,40 @@
|
|||
From 999d4e74d34afa233ad8ad0c70b989d77a21957f Mon Sep 17 00:00:00 2001
|
||||
From: Petr Viktorin <encukou@gmail.com>
|
||||
Date: Wed, 23 Aug 2023 20:00:07 +0200
|
||||
Subject: [PATCH] gh-107811: tarfile: treat overflow in UID/GID as failure to
|
||||
set it (#108369)
|
||||
|
||||
Upstream-Status: Backport [https://github.com/python/cpython/pull/108369]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
Lib/tarfile.py | 3 ++-
|
||||
.../Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst | 3 +++
|
||||
2 files changed, 5 insertions(+), 1 deletion(-)
|
||||
create mode 100644 Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst
|
||||
|
||||
diff --git a/Lib/tarfile.py b/Lib/tarfile.py
|
||||
index 3bbbcaa..473167d 100755
|
||||
--- a/Lib/tarfile.py
|
||||
+++ b/Lib/tarfile.py
|
||||
@@ -2557,7 +2557,8 @@ class TarFile(object):
|
||||
os.lchown(targetpath, u, g)
|
||||
else:
|
||||
os.chown(targetpath, u, g)
|
||||
- except OSError as e:
|
||||
+ except (OSError, OverflowError) as e:
|
||||
+ # OverflowError can be raised if an ID doesn't fit in `id_t`
|
||||
raise ExtractError("could not change owner") from e
|
||||
|
||||
def chmod(self, tarinfo, targetpath):
|
||||
diff --git a/Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst b/Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst
|
||||
new file mode 100644
|
||||
index 0000000..ffca413
|
||||
--- /dev/null
|
||||
+++ b/Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst
|
||||
@@ -0,0 +1,3 @@
|
||||
+:mod:`tarfile`: extraction of members with overly large UID or GID (e.g. on
|
||||
+an OS with 32-bit :c:type:`!id_t`) now fails in the same way as failing to
|
||||
+set the ID.
|
||||
--
|
||||
2.45.0
|
||||
|
||||
|
|
@ -36,6 +36,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
|
|||
file://deterministic_imports.patch \
|
||||
file://0001-Avoid-shebang-overflow-on-python-config.py.patch \
|
||||
file://0001-test_storlines-skip-due-to-load-variability.patch \
|
||||
file://0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch \
|
||||
"
|
||||
|
||||
SRC_URI:append:class-native = " \
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user