From: Stacy Gaikovaia <[email protected]> This patch fixes a critical CVE in Python 3.9.0. It can be removed after an uprev to Python 3.9.1.
CVE: CVE-2020-27619 Upstream-Status: Backport Signed-off-by: Stacy Gaikovaia <[email protected]> --- ...ger-call-eval-on-content-received-vi.patch | 77 +++++++++++++++++++ meta/recipes-devtools/python/python3_3.9.0.bb | 1 + 2 files changed, 78 insertions(+) create mode 100644 meta/recipes-devtools/python/python3/0001-bpo-41944-No-longer-call-eval-on-content-received-vi.patch diff --git a/meta/recipes-devtools/python/python3/0001-bpo-41944-No-longer-call-eval-on-content-received-vi.patch b/meta/recipes-devtools/python/python3/0001-bpo-41944-No-longer-call-eval-on-content-received-vi.patch new file mode 100644 index 0000000000..c51d0730a7 --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-bpo-41944-No-longer-call-eval-on-content-received-vi.patch @@ -0,0 +1,77 @@ +From e912e945f2960029d039d3390ea08835ad39374b Mon Sep 17 00:00:00 2001 +From: "Miss Skeleton (bot)" <[email protected]> +Date: Mon, 19 Oct 2020 21:46:10 -0700 +Subject: [PATCH] bpo-41944: No longer call eval() on content received via HTTP + in the CJK codec tests (GH-22566) (GH-22579) + +(cherry picked from commit 2ef5caa58febc8968e670e39e3d37cf8eef3cab8) + +Co-authored-by: Serhiy Storchaka <[email protected]> + +This patch fixes a critical CVE in Python 3.9.0. It can +be removed after we purev to puthon 3.9.1. + +CVE: CVE-2020-27619 + +Upstream-Status: Backport + +Signed-off-by: Stacy Gaikovaia <[email protected]> + +--- + Lib/test/multibytecodec_support.py | 22 +++++++------------ + .../2020-10-05-17-43-46.bpo-41944.rf1dYb.rst | 1 + + 2 files changed, 9 insertions(+), 14 deletions(-) + create mode 100644 Misc/NEWS.d/next/Tests/2020-10-05-17-43-46.bpo-41944.rf1dYb.rst + +diff --git a/Lib/test/multibytecodec_support.py b/Lib/test/multibytecodec_support.py +index f9884c68eb..98feec2f60 100644 +--- a/Lib/test/multibytecodec_support.py ++++ b/Lib/test/multibytecodec_support.py +@@ -300,29 +300,23 @@ class TestBase_Mapping(unittest.TestCase): + self._test_mapping_file_plain() + + def _test_mapping_file_plain(self): +- unichrs = lambda s: ''.join(map(chr, map(eval, s.split('+')))) ++ def unichrs(s): ++ return ''.join(chr(int(x, 16)) for x in s.split('+')) ++ + urt_wa = {} + + with self.open_mapping_file() as f: + for line in f: + if not line: + break +- data = line.split('#')[0].strip().split() ++ data = line.split('#')[0].split() + if len(data) != 2: + continue + +- csetval = eval(data[0]) +- if csetval <= 0x7F: +- csetch = bytes([csetval & 0xff]) +- elif csetval >= 0x1000000: +- csetch = bytes([(csetval >> 24), ((csetval >> 16) & 0xff), +- ((csetval >> 8) & 0xff), (csetval & 0xff)]) +- elif csetval >= 0x10000: +- csetch = bytes([(csetval >> 16), ((csetval >> 8) & 0xff), +- (csetval & 0xff)]) +- elif csetval >= 0x100: +- csetch = bytes([(csetval >> 8), (csetval & 0xff)]) +- else: ++ if data[0][:2] != '0x': ++ self.fail(f"Invalid line: {line!r}") ++ csetch = bytes.fromhex(data[0][2:]) ++ if len(csetch) == 1 and 0x80 <= csetch[0]: + continue + + unich = unichrs(data[1]) +diff --git a/Misc/NEWS.d/next/Tests/2020-10-05-17-43-46.bpo-41944.rf1dYb.rst b/Misc/NEWS.d/next/Tests/2020-10-05-17-43-46.bpo-41944.rf1dYb.rst +new file mode 100644 +index 0000000000..4f9782f1c8 +--- /dev/null ++++ b/Misc/NEWS.d/next/Tests/2020-10-05-17-43-46.bpo-41944.rf1dYb.rst +@@ -0,0 +1 @@ ++Tests for CJK codecs no longer call ``eval()`` on content received via HTTP. +-- +2.17.1 + diff --git a/meta/recipes-devtools/python/python3_3.9.0.bb b/meta/recipes-devtools/python/python3_3.9.0.bb index 8fe60ea016..c31e7c8607 100644 --- a/meta/recipes-devtools/python/python3_3.9.0.bb +++ b/meta/recipes-devtools/python/python3_3.9.0.bb @@ -29,6 +29,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \ file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \ file://0001-Lib-sysconfig.py-use-libdir-values-from-configuratio.patch \ + file://0001-bpo-41944-No-longer-call-eval-on-content-received-vi.patch \ " SRC_URI_append_class-native = " \ -- 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#144855): https://lists.openembedded.org/g/openembedded-core/message/144855 Mute This Topic: https://lists.openembedded.org/mt/78394201/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
