diff options
| author | Khem Raj <raj.khem@gmail.com> | 2024-05-08 18:30:46 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-13 15:42:27 +0100 |
| commit | 20845b006631db73d47c3055b7b747c6abe0e069 (patch) | |
| tree | 3469d861cb658afd6938ea9194c2932a0c3f0096 /meta/recipes-devtools/python/python3 | |
| parent | 613928bbb51b03feabe7931afba2b2a63a4169c8 (diff) | |
| download | poky-20845b006631db73d47c3055b7b747c6abe0e069.tar.gz | |
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: 43104b547cb79693c83df0882773ae8dd74b1d35)
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>
Diffstat (limited to 'meta/recipes-devtools/python/python3')
| -rw-r--r-- | meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch b/meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch new file mode 100644 index 0000000000..88b84c6024 --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch | |||
| @@ -0,0 +1,40 @@ | |||
| 1 | From 999d4e74d34afa233ad8ad0c70b989d77a21957f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Petr Viktorin <encukou@gmail.com> | ||
| 3 | Date: Wed, 23 Aug 2023 20:00:07 +0200 | ||
| 4 | Subject: [PATCH] gh-107811: tarfile: treat overflow in UID/GID as failure to | ||
| 5 | set it (#108369) | ||
| 6 | |||
| 7 | Upstream-Status: Backport [https://github.com/python/cpython/pull/108369] | ||
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 9 | --- | ||
| 10 | Lib/tarfile.py | 3 ++- | ||
| 11 | .../Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst | 3 +++ | ||
| 12 | 2 files changed, 5 insertions(+), 1 deletion(-) | ||
| 13 | create mode 100644 Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst | ||
| 14 | |||
| 15 | diff --git a/Lib/tarfile.py b/Lib/tarfile.py | ||
| 16 | index 3bbbcaa..473167d 100755 | ||
| 17 | --- a/Lib/tarfile.py | ||
| 18 | +++ b/Lib/tarfile.py | ||
| 19 | @@ -2557,7 +2557,8 @@ class TarFile(object): | ||
| 20 | os.lchown(targetpath, u, g) | ||
| 21 | else: | ||
| 22 | os.chown(targetpath, u, g) | ||
| 23 | - except OSError as e: | ||
| 24 | + except (OSError, OverflowError) as e: | ||
| 25 | + # OverflowError can be raised if an ID doesn't fit in `id_t` | ||
| 26 | raise ExtractError("could not change owner") from e | ||
| 27 | |||
| 28 | def chmod(self, tarinfo, targetpath): | ||
| 29 | 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 | ||
| 30 | new file mode 100644 | ||
| 31 | index 0000000..ffca413 | ||
| 32 | --- /dev/null | ||
| 33 | +++ b/Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst | ||
| 34 | @@ -0,0 +1,3 @@ | ||
| 35 | +:mod:`tarfile`: extraction of members with overly large UID or GID (e.g. on | ||
| 36 | +an OS with 32-bit :c:type:`!id_t`) now fails in the same way as failing to | ||
| 37 | +set the ID. | ||
| 38 | -- | ||
| 39 | 2.45.0 | ||
| 40 | |||
