Skip to contentSkip to conversation

qemu: fix CVE-2020-10702/10761/13362/13659/13800

PATCH New Lee Chee Yang 1 participant 2 messages Jul 3, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 qemu: fix CVE-2020-10702/10761/13362/13659/13800

From: Lee Chee Yang <[email protected]>

fix these CVE:
CVE-2020-10702
CVE-2020-10761
CVE-2020-13362
CVE-2020-13659
CVE-2020-13800

---
 meta/recipes-devtools/qemu/qemu.inc                |   5 +
 .../qemu/qemu/CVE-2020-10702.patch                 |  52 +++++++
 .../qemu/qemu/CVE-2020-10761.patch                 | 150 +++++++++++++++++++++
 .../qemu/qemu/CVE-2020-13362.patch                 |  52 +++++++
 .../qemu/qemu/CVE-2020-13659.patch                 |  55 ++++++++
 .../qemu/qemu/CVE-2020-13800.patch                 |  60 +++++++++
 6 files changed, 374 insertions(+)
 create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-10702.patch
 create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-10761.patch
 create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-13362.patch
 create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-13659.patch
 create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-13800.patch
meta/recipes-devtools/qemu/qemu.inc +5 -0
index 3e50069..24b0379 100644
@@ -39,6 +39,11 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
            file://CVE-2020-11102.patch \
 	   file://CVE-2020-11869.patch \
 	   file://CVE-2020-13361.patch \
+	   file://CVE-2020-10761.patch \
+	   file://CVE-2020-10702.patch \
+	   file://CVE-2020-13659.patch \
+	   file://CVE-2020-13800.patch \
+	   file://CVE-2020-13362.patch \
 	   "
 UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
 
meta/recipes-devtools/qemu/qemu/CVE-2020-10702.patch new file +52 -0

52 lines not on this page · raw message

meta/recipes-devtools/qemu/qemu/CVE-2020-10761.patch new file +150 -0

150 lines not on this page · raw message

meta/recipes-devtools/qemu/qemu/CVE-2020-13362.patch new file +52 -0

52 lines not on this page · raw message

meta/recipes-devtools/qemu/qemu/CVE-2020-13659.patch new file +55 -0

55 lines not on this page · raw message

meta/recipes-devtools/qemu/qemu/CVE-2020-13800.patch new file +60 -0

60 lines not on this page · raw message

Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/2 python3: fix CVE-2020-14422

From: Lee Chee Yang <[email protected]>

---
 .../python/python3/CVE-2020-14422.patch            | 77 ++++++++++++++++++++++
 meta/recipes-devtools/python/python3_3.8.2.bb      |  1 +
 2 files changed, 78 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python3/CVE-2020-14422.patch
meta/recipes-devtools/python/python3/CVE-2020-14422.patch new file +77 -0
new file mode 100644
index 0000000..6889e46
@@ -0,0 +1,77 @@
+From dc8ce8ead182de46584cc1ed8a8c51d48240cbd5 Mon Sep 17 00:00:00 2001
+From: "Miss Islington (bot)"
+ <[email protected]>
+Date: Mon, 29 Jun 2020 11:12:50 -0700
+Subject: [PATCH] bpo-41004: Resolve hash collisions for IPv4Interface and
+ IPv6Interface (GH-21033)
+
+The __hash__() methods of classes IPv4Interface and IPv6Interface had issue
+of generating constant hash values of 32 and 128 respectively causing hash collisions.
+The fix uses the hash() function to generate hash values for the objects
+instead of XOR operation
+(cherry picked from commit b30ee26e366bf509b7538d79bfec6c6d38d53f28)
+
+Co-authored-by: Ravi Teja P <[email protected]>
+
+Upstream-Status: Backport [https://github.com/python/cpython/commit/dc8ce8ead182de46584cc1ed8a8c51d48240cbd5]
+CVE: CVE-2020-14422
+Signed-off-by: Chee Yang Lee <[email protected]>
+---
+ Lib/ipaddress.py                                     |  4 ++--
+ Lib/test/test_ipaddress.py                           | 12 ++++++++++++
+ .../2020-06-29-16-02-29.bpo-41004.ovF0KZ.rst         |  1 +
+ 3 files changed, 15 insertions(+), 2 deletions(-)
+ create mode 100644 Misc/NEWS.d/next/Security/2020-06-29-16-02-29.bpo-41004.ovF0KZ.rst
+
+diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py
+index 873c7644081af..a3a04f7f4b309 100644
+--- a/Lib/ipaddress.py
++++ b/Lib/ipaddress.py
+@@ -1370,7 +1370,7 @@ def __lt__(self, other):
+             return False
+ 
+     def __hash__(self):
+-        return self._ip ^ self._prefixlen ^ int(self.network.network_address)
++        return hash((self._ip, self._prefixlen, int(self.network.network_address)))
+ 
+     __reduce__ = _IPAddressBase.__reduce__
+ 
+@@ -2017,7 +2017,7 @@ def __lt__(self, other):
+             return False
+ 
+     def __hash__(self):
+-        return self._ip ^ self._prefixlen ^ int(self.network.network_address)
++        return hash((self._ip, self._prefixlen, int(self.network.network_address)))
+ 
+     __reduce__ = _IPAddressBase.__reduce__
+ 
+diff --git a/Lib/test/test_ipaddress.py b/Lib/test/test_ipaddress.py
+index de77111705b69..2eba740e5e7a4 100644
+--- a/Lib/test/test_ipaddress.py
++++ b/Lib/test/test_ipaddress.py
+@@ -2053,6 +2053,18 @@ def testsixtofour(self):
+                          sixtofouraddr.sixtofour)
+         self.assertFalse(bad_addr.sixtofour)
+ 
++    # issue41004 Hash collisions in IPv4Interface and IPv6Interface
++    def testV4HashIsNotConstant(self):
++        ipv4_address1 = ipaddress.IPv4Interface("1.2.3.4")
++        ipv4_address2 = ipaddress.IPv4Interface("2.3.4.5")
++        self.assertNotEqual(ipv4_address1.__hash__(), ipv4_address2.__hash__())
++
++    # issue41004 Hash collisions in IPv4Interface and IPv6Interface
++    def testV6HashIsNotConstant(self):
++        ipv6_address1 = ipaddress.IPv6Interface("2001:658:22a:cafe:200:0:0:1")
++        ipv6_address2 = ipaddress.IPv6Interface("2001:658:22a:cafe:200:0:0:2")
++        self.assertNotEqual(ipv6_address1.__hash__(), ipv6_address2.__hash__())
++
+ 
+ if __name__ == '__main__':
+     unittest.main()
+diff --git a/Misc/NEWS.d/next/Security/2020-06-29-16-02-29.bpo-41004.ovF0KZ.rst b/Misc/NEWS.d/next/Security/2020-06-29-16-02-29.bpo-41004.ovF0KZ.rst
+new file mode 100644
+index 0000000000000..1380b31fbe9f4
+--- /dev/null
++++ b/Misc/NEWS.d/next/Security/2020-06-29-16-02-29.bpo-41004.ovF0KZ.rst
+@@ -0,0 +1 @@
++The __hash__() methods of  ipaddress.IPv4Interface and ipaddress.IPv6Interface incorrectly generated constant hash values of 32 and 128 respectively. This resulted in always causing hash collisions. The fix uses hash() to generate hash values for the tuple of (address, mask length, network address).
meta/recipes-devtools/python/python3_3.8.2.bb +1 -0
index a4a16fd..99d9f67 100644
@@ -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-2020-14422.patch \
            "
 
 SRC_URI_append_class-native = " \
Signature · 1 line
2.7.4