From ff46766bf74cb96e103715de232c3cf09a69616e Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Tue, 22 Sep 2015 01:37:21 +0200 Subject: python: Backport CVE-2013-1752 fix from upstream Signed-off-by: Tudor Florea --- .../python-2.7.3-CVE-2013-1752-httplib-fix.patch | 45 ++++++++++++++++++++++ meta/recipes-devtools/python/python_2.7.3.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta/recipes-devtools/python/python/python-2.7.3-CVE-2013-1752-httplib-fix.patch diff --git a/meta/recipes-devtools/python/python/python-2.7.3-CVE-2013-1752-httplib-fix.patch b/meta/recipes-devtools/python/python/python-2.7.3-CVE-2013-1752-httplib-fix.patch new file mode 100644 index 0000000000..e68f53f4bc --- /dev/null +++ b/meta/recipes-devtools/python/python/python-2.7.3-CVE-2013-1752-httplib-fix.patch @@ -0,0 +1,45 @@ +Upstream-Status: Backport + +CVE-2013-1752: httplib: HTTPMessage.readheaders() raises an HTTPException +when more than 100 headers are read. +Patch by Jyrki Pulliainen and Daniel Eriksson. + +Signed-off-by: Tudor Florea +--- +diff -r 133ee2b48e52 Lib/httplib.py +--- a/Lib/httplib.py Fri Aug 01 23:51:51 2014 -0700 ++++ b/Lib/httplib.py Sat Aug 02 13:59:25 2014 +0000 +@@ -214,6 +214,7 @@ + + # maximal line length when calling readline(). + _MAXLINE = 65536 ++_MAXHEADERS = 100 + + class HTTPMessage(mimetools.Message): + +@@ -271,6 +272,8 @@ + elif self.seekable: + tell = self.fp.tell + while True: ++ if len(hlist) > _MAXHEADERS: ++ raise HTTPException("got more than %d headers" % _MAXHEADERS) + if tell: + try: + startofline = tell() +diff -r 133ee2b48e52 Lib/test/test_httplib.py +--- a/Lib/test/test_httplib.py Fri Aug 01 23:51:51 2014 -0700 ++++ b/Lib/test/test_httplib.py Sat Aug 02 13:59:25 2014 +0000 +@@ -262,6 +262,13 @@ + if resp.read() != "": + self.fail("Did not expect response from HEAD request") + ++ def test_too_many_headers(self): ++ headers = '\r\n'.join('Header%d: foo' % i for i in xrange(200)) + '\r\n' ++ text = ('HTTP/1.1 200 OK\r\n' + headers) ++ s = FakeSocket(text) ++ r = httplib.HTTPResponse(s) ++ self.assertRaises(httplib.HTTPException, r.begin) ++ + def test_send_file(self): + expected = 'GET /foo HTTP/1.1\r\nHost: example.com\r\n' \ + 'Accept-Encoding: identity\r\nContent-Length:' diff --git a/meta/recipes-devtools/python/python_2.7.3.bb b/meta/recipes-devtools/python/python_2.7.3.bb index de1f57ffc2..5e0181da56 100644 --- a/meta/recipes-devtools/python/python_2.7.3.bb +++ b/meta/recipes-devtools/python/python_2.7.3.bb @@ -42,6 +42,7 @@ SRC_URI += "\ file://python2.7.3-nossl3.patch \ file://ctypes-libffi-aarch64.patch \ file://libffi-aarch64.patch \ + file://python-2.7.3-CVE-2013-1752-httplib-fix.patch \ " S = "${WORKDIR}/Python-${PV}" -- cgit v1.2.3-54-g00ecf