diff options
Diffstat (limited to 'recipes-devtools/python')
-rw-r--r-- | recipes-devtools/python/python.inc | 1 | ||||
-rw-r--r-- | recipes-devtools/python/python/CVE-2019-20907.patch | 46 |
2 files changed, 47 insertions, 0 deletions
diff --git a/recipes-devtools/python/python.inc b/recipes-devtools/python/python.inc index 787f23e..dc5807a 100644 --- a/recipes-devtools/python/python.inc +++ b/recipes-devtools/python/python.inc @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=203a6dbc802ee896020a47161e759642" SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://CVE-2019-9674.patch \ + file://CVE-2019-20907.patch \ " SRC_URI[sha256sum] = "b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43" diff --git a/recipes-devtools/python/python/CVE-2019-20907.patch b/recipes-devtools/python/python/CVE-2019-20907.patch new file mode 100644 index 0000000..624afd2 --- /dev/null +++ b/recipes-devtools/python/python/CVE-2019-20907.patch @@ -0,0 +1,46 @@ +From 70074d5b0d3fd9efeed57381044024f295167765 Mon Sep 17 00:00:00 2001 +From: Rishi <rishi_devan@mail.com> +Date: Wed, 15 Jul 2020 13:51:00 +0200 +Subject: [PATCH] bpo-39017: Avoid infinite loop in the tarfile module + + (GH-21454) + +Avoid infinite loop when reading specially crafted TAR files using the tarfile module +(CVE-2019-20907). + +--- + Lib/tarfile.py | 2 ++ + Lib/test/test_tarfile.py | 7 +++++++ + 2 files changed, 9 insertions(+) + +diff --git a/Lib/tarfile.py b/Lib/tarfile.py +index adf91d5..574a6bb 100644 +--- a/Lib/tarfile.py ++++ b/Lib/tarfile.py +@@ -1400,6 +1400,8 @@ class TarInfo(object): + + length, keyword = match.groups() + length = int(length) ++ if length == 0: ++ raise InvalidHeaderError("invalid header") + value = buf[match.end(2) + 1:match.start(1) + length - 1] + + keyword = keyword.decode("utf8") +diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py +index 89bd738..c61d02b 100644 +--- a/Lib/test/test_tarfile.py ++++ b/Lib/test/test_tarfile.py +@@ -321,6 +321,13 @@ class CommonReadTest(ReadTest): + with self.assertRaisesRegexp(tarfile.ReadError, "unexpected end of data"): + tar.extractfile(t).read() + ++ def test_length_zero_header(self): ++ # bpo-39017 (CVE-2019-20907): reading a zero-length header should fail ++ # with an exception ++ with self.assertRaisesRegex(tarfile.ReadError, "file could not be opened successfully"): ++ with tarfile.open(support.findfile('recursion.tar')) as tar: ++ pass ++ + + class MiscReadTest(CommonReadTest): + taropen = tarfile.TarFile.taropen |