python3: fix CVE-2019-20907
PATCH 1/1 python3: fix CVE-2019-20907
- move fixing patch for CVE-2020-8492 to the right location
---
...VE-2020-8492-Fix-AbstractBasicAuthHandler.patch | 0
.../python/python3/CVE-2019-20907.patch | 135 +++++++++++++++++++++
meta/recipes-devtools/python/python3_3.8.2.bb | 1 +
3 files changed, 136 insertions(+)
rename meta/recipes-devtools/python/{files => python3}/0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch (100%)
create mode 100644 meta/recipes-devtools/python/python3/CVE-2019-20907.patchmeta/recipes-devtools/python/python3/0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch renamed from meta/recipes-devtools/python/files/0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch +0 -0
meta/recipes-devtools/python/python3/CVE-2019-20907.patch new file +135 -0
135 lines not on this page · raw message
meta/recipes-devtools/python/python3_3.8.2.bb +1 -0
@@ -33,6 +33,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \ file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \ file://0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch \ + file://CVE-2019-20907.patch \ file://CVE-2020-14422.patch \ file://CVE-2020-26116.patch \ file://CVE-2020-27619.patch \
Signature · 1 line
2.11.0
Thanks Andrej! I appreciate the help in CVE reduction.
This patch is missing some of the requirements (CVE: tag, sign-off, references) outlined in the "Patch name convention and commit message" section of:
https://wiki.yoctoproject.org/wiki/Security
Could you submit a v2?
Thanks again!
Steve
Quoted 172 lines · Andrej Valek
- move fixing patch for CVE-2020-8492 to the right location
Signed-off-by Andrej Valek <[email protected]>--- ...VE-2020-8492-Fix-AbstractBasicAuthHandler.patch | 0 .../python/python3/CVE-2019-20907.patch | 135 +++++++++++++++++++++ meta/recipes-devtools/python/python3_3.8.2.bb | 1 + 3 files changed, 136 insertions(+) rename meta/recipes-devtools/python/{files => python3}/0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch (100%) create mode 100644 meta/recipes-devtools/python/python3/CVE-2019-20907.patchmeta/recipes-devtools/python/python3/0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch renamed from meta/recipes-devtools/python/files/0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch +0
-0meta/recipes-devtools/python/python3/CVE-2019-20907.patch new file +135
-0@@ -0,0 +1,135 @@ +From 1fa6ef2bc7cee1c8e088dd8b397d9b2d54036dbc Mon Sep 17 00:00:00 2001 +From: Rajarishi Devarajan <[email protected]> +Date: Sun, 12 Jul 2020 23:47:42 +0200 +Subject: [PATCH 1/4] bpo-39017 Fix infinite loop in the tarfile module + +Add a check for length = 0 in the _proc_pax function to avoid running into an infinite loop +--- + Lib/tarfile.py | 2 ++ + Lib/test/recursion.tar | Bin 0 -> 516 bytes + Lib/test/test_tarfile.py | 5 +++++ + 3 files changed, 7 insertions(+) + create mode 100644 Lib/test/recursion.tar + +diff --git a/Lib/tarfile.py b/Lib/tarfile.py +index e2b60532f693d..6769066cabd6f 100755 +--- a/Lib/tarfile.py ++++ b/Lib/tarfile.py +@@ -1249,6 +1249,8 @@ def _proc_pax(self, tarfile): + + 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] + + # Normally, we could just use "utf-8" as the encoding and "strict" +diff --git a/Lib/test/recursion.tar b/Lib/test/recursion.tar +new file mode 100644 +index 0000000000000000000000000000000000000000..b8237251964983f54ed1966297e887636cd0c5f4 +GIT binary patch +literal 516 +zcmYdFPRz+kEn=W0Fn}74P8%Xw3X=l~85kIuo0>8xq$A1Gm}!7)KUsFc41m#O8A5+e +I1_}|j06>QaCIA2c + +literal 0 +HcmV?d00001 + +diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py +index d60d35b5be04a..1f31a8f700766 100644 +--- a/Lib/test/test_tarfile.py ++++ b/Lib/test/test_tarfile.py +@@ -429,6 +429,11 @@ def test_premature_end_of_archive(self): + with self.assertRaisesRegex(tarfile.ReadError, "unexpected end of data"): + tar.extractfile(t).read() + ++ def test_length_zero_header(self): ++ with self.assertRaisesRegex(tarfile.ReadError, "file could not be opened successfully"): ++ with tarfile.open(support.findfile('recursion.tar')) as tar: ++ tar.getmembers() ++ + class MiscReadTestBase(CommonReadTest): + def requires_name_attribute(self): + pass + +From c43a5afcf9cc2dab2410c35632f66e055a938c02 Mon Sep 17 00:00:00 2001 +From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com> +Date: Sun, 12 Jul 2020 22:16:59 +0000 +Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?= + =?UTF-8?q?rb=5Fit.?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + .../NEWS.d/next/Library/2020-07-12-22-16-58.bpo-39017.x3Cg-9.rst | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 Misc/NEWS.d/next/Library/2020-07-12-22-16-58.bpo-39017.x3Cg-9.rst + +diff --git a/Misc/NEWS.d/next/Library/2020-07-12-22-16-58.bpo-39017.x3Cg-9.rst b/Misc/NEWS.d/next/Library/2020-07-12-22-16-58.bpo-39017.x3Cg-9.rst +new file mode 100644 +index 0000000000000..10d98f759ac87 +--- /dev/null ++++ b/Misc/NEWS.d/next/Library/2020-07-12-22-16-58.bpo-39017.x3Cg-9.rst +@@ -0,0 +1 @@ ++Add check for length = 0 to avoid infinite loop inside _proc_pax function in tarfile module +\ No newline at end of file + +From 5f7b94574db21086dc2693210a975def7cc058e3 Mon Sep 17 00:00:00 2001 +From: Rishi <[email protected]> +Date: Tue, 14 Jul 2020 12:39:14 +0200 +Subject: [PATCH 3/4] Apply suggestions from code review + +Add relevant CVE number in inline comments + +Co-authored-by: Petr Viktorin <[email protected]> +--- + Lib/test/test_tarfile.py | 2 ++ + .../next/Library/2020-07-12-22-16-58.bpo-39017.x3Cg-9.rst | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py +index 1f31a8f700766..827ffaf3273b3 100644 +--- a/Lib/test/test_tarfile.py ++++ b/Lib/test/test_tarfile.py +@@ -430,6 +430,8 @@ def test_premature_end_of_archive(self): + 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: + tar.getmembers() +diff --git a/Misc/NEWS.d/next/Library/2020-07-12-22-16-58.bpo-39017.x3Cg-9.rst b/Misc/NEWS.d/next/Library/2020-07-12-22-16-58.bpo-39017.x3Cg-9.rst +index 10d98f759ac87..ad26676f8b856 100644 +--- a/Misc/NEWS.d/next/Library/2020-07-12-22-16-58.bpo-39017.x3Cg-9.rst ++++ b/Misc/NEWS.d/next/Library/2020-07-12-22-16-58.bpo-39017.x3Cg-9.rst +@@ -1 +1 @@ +-Add check for length = 0 to avoid infinite loop inside _proc_pax function in tarfile module +\ No newline at end of file ++Avoid infinite loop when reading specially crafted TAR files using the tarfile module (CVE-2019-20907). + +From 54084a8beef62fa0ac443618be2352f67f2bb8c3 Mon Sep 17 00:00:00 2001 +From: rishi93 <[email protected]> +Date: Tue, 14 Jul 2020 12:45:48 +0200 +Subject: [PATCH 4/4] bpo-39017: Fix infinite loop in the tarfile module + +Replace code that is never called with pass in tarfile testcase +--- + Lib/test/test_tarfile.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py +index 827ffaf3273b3..3ddeb97f5268f 100644 +--- a/Lib/test/test_tarfile.py ++++ b/Lib/test/test_tarfile.py +@@ -434,7 +434,7 @@ def test_length_zero_header(self): + # with an exception + with self.assertRaisesRegex(tarfile.ReadError, "file could not be opened successfully"): + with tarfile.open(support.findfile('recursion.tar')) as tar: +- tar.getmembers() ++ pass + + class MiscReadTestBase(CommonReadTest): + def requires_name_attribute(self):meta/recipes-devtools/python/python3_3.8.2.bb +1
-1@@ -33,6 +33,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \ file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \ file://0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch \ + file://CVE-2019-20907.patch \ file://CVE-2020-14422.patch \ file://CVE-2020-26116.patch \ file://CVE-2020-27619.patch \ --2.11.0
PATCH v2 1/1 python3: fix CVE-2019-20907
In reply to Andrej Valek- move fixing patch for CVE-2020-8492 to the right location
---
...VE-2020-8492-Fix-AbstractBasicAuthHandler.patch | 0
.../python/python3/CVE-2019-20907.patch | 73 ++++++++++++++++++++++
meta/recipes-devtools/python/python3_3.8.2.bb | 1 +
3 files changed, 74 insertions(+)
rename meta/recipes-devtools/python/{files => python3}/0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch (100%)
create mode 100644 meta/recipes-devtools/python/python3/CVE-2019-20907.patchmeta/recipes-devtools/python/python3/0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch renamed from meta/recipes-devtools/python/files/0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch +0 -0
meta/recipes-devtools/python/python3/CVE-2019-20907.patch new file +73 -0
73 lines not on this page · raw message
meta/recipes-devtools/python/python3_3.8.2.bb +1 -0
@@ -33,6 +33,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \ file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \ file://0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch \ + file://CVE-2019-20907.patch \ file://CVE-2020-14422.patch \ file://CVE-2020-26116.patch \ file://CVE-2020-27619.patch \
Signature · 1 line
2.11.0
Quoted 53 lines · Andrej Valek
- move fixing patch for CVE-2020-8492 to the right location
Signed-off-by Andrej Valek <[email protected]>--- ...VE-2020-8492-Fix-AbstractBasicAuthHandler.patch | 0 .../python/python3/CVE-2019-20907.patch | 73 ++++++++++++++++++++++ meta/recipes-devtools/python/python3_3.8.2.bb | 1 + 3 files changed, 74 insertions(+) rename meta/recipes-devtools/python/{files => python3}/0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch (100%) create mode 100644 meta/recipes-devtools/python/python3/CVE-2019-20907.patchmeta/recipes-devtools/python/python3/0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch renamed from meta/recipes-devtools/python/files/0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch +0
-0meta/recipes-devtools/python/python3/CVE-2019-20907.patch new file +31
-0@@ -0,0 +1,73 @@ +From a06a6bf4e67a50561f6d6fb33534df1d3035ea34 Mon Sep 17 00:00:00 2001 +From: Rishi <[email protected]> +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). +(cherry picked from commit 5a8d121a1f3ef5ad7c105ee378cc79a3eac0c7d4) + +Co-authored-by: Rishi <[email protected]> + +Upstream-Status: Backport [https://github.com/python/cpython/commit/c55479556db015f48fc8bbca17f64d3e65598559] +CVE: CVE-2019-20907 +Signed-off-by: Andrej Valek <[email protected]> +--- + Lib/tarfile.py | 2 ++ + Lib/test/recursion.tar | Bin 0 -> 516 bytes + Lib/test/test_tarfile.py | 7 +++++++ + .../2020-07-12-22-16-58.bpo-39017.x3Cg-9.rst | 1 + + 4 files changed, 10 insertions(+) + create mode 100644 Lib/test/recursion.tar + create mode 100644 Misc/NEWS.d/next/Library/2020-07-12-22-16-58.bpo-39017.x3Cg-9.rst + +diff --git a/Lib/tarfile.py b/Lib/tarfile.py +index d31b9cbb51d65..7a69e1b1aa544 100755 +--- a/Lib/tarfile.py ++++ b/Lib/tarfile.py +@@ -1241,6 +1241,8 @@ def _proc_pax(self, tarfile): + + length, keyword = match.groups()
meta/recipes-devtools/python/python3/CVE-2019-20907.patch line 41
Quoted 10 lines
meta/recipes-devtools/python/python3/CVE-2019-20907.patch new file +10
-0+ length = int(length) ++ if length == 0: ++ raise InvalidHeaderError("invalid header") + value = buf[match.end(2) + 1:match.start(1) + length - 1] + + # Normally, we could just use "utf-8" as the encoding and "strict" +diff --git a/Lib/test/recursion.tar b/Lib/test/recursion.tar +new file mode 100644 +index 0000000000000000000000000000000000000000..b8237251964983f54ed1966297e887636cd0c5f4 +GIT binary patch
This binary patch section is causing autobuilder failures:
https://errors.yoctoproject.org/Errors/Details/539135/
Steve
Quoted 47 lines
meta/recipes-devtools/python/python3/CVE-2019-20907.patch new file +32
-0+literal 516 +zcmYdFPRz+kEn=W0Fn}74P8%Xw3X=l~85kIuo0>8xq$A1Gm}!7)KUsFc41m#O8A5+e +I1_}|j06>QaCIA2c + +literal 0 +HcmV?d00001 + +diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py +index 15324a4e48819..b512168d6ea87 100644 +--- a/Lib/test/test_tarfile.py ++++ b/Lib/test/test_tarfile.py +@@ -397,6 +397,13 @@ def test_premature_end_of_archive(self): + with self.assertRaisesRegex(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 MiscReadTestBase(CommonReadTest): + def requires_name_attribute(self): + pass +diff --git a/Misc/NEWS.d/next/Library/2020-07-12-22-16-58.bpo-39017.x3Cg-9.rst b/Misc/NEWS.d/next/Library/2020-07-12-22-16-58.bpo-39017.x3Cg-9.rst +new file mode 100644 +index 0000000000000..ad26676f8b856 +--- /dev/null ++++ b/Misc/NEWS.d/next/Library/2020-07-12-22-16-58.bpo-39017.x3Cg-9.rst +@@ -0,0 +1 @@ ++Avoid infinite loop when reading specially crafted TAR files using the tarfile module (CVE-2019-20907).meta/recipes-devtools/python/python3_3.8.2.bb +1
-1@@ -33,6 +33,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \ file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \ file://0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch \ + file://CVE-2019-20907.patch \ file://CVE-2020-14422.patch \ file://CVE-2020-26116.patch \ file://CVE-2020-27619.patch \ --2.11.0
PATCH v3 1/1 python3: fix CVE-2019-20907
In reply to Andrej Valek- move fixing patch for CVE-2020-8492 to the right location
---
...VE-2020-8492-Fix-AbstractBasicAuthHandler.patch | 0
.../python/python3/CVE-2019-20907.patch | 44 ++++++++++++++++++++++
meta/recipes-devtools/python/python3_3.8.2.bb | 1 +
3 files changed, 45 insertions(+)
rename meta/recipes-devtools/python/{files => python3}/0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch (100%)
create mode 100644 meta/recipes-devtools/python/python3/CVE-2019-20907.patchmeta/recipes-devtools/python/python3/0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch renamed from meta/recipes-devtools/python/files/0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch +0 -0
meta/recipes-devtools/python/python3/CVE-2019-20907.patch new file +44 -0
44 lines not on this page · raw message
meta/recipes-devtools/python/python3_3.8.2.bb +1 -0
@@ -33,6 +33,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \ file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \ file://0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch \ + file://CVE-2019-20907.patch \ file://CVE-2020-14422.patch \ file://CVE-2020-26116.patch \ file://CVE-2020-27619.patch \
Signature · 1 line
2.11.0