From d25b86ce8f2712d02bb7cde78d7f9ea5a57a7770 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sun, 6 Nov 2016 10:36:07 -0800 Subject: python-2.7: Security fix CVE-2016-5636 Affects python-2.7 < 2.7.12 Signed-off-by: Armin Kuster --- .../python/python/CVE-2016-5636.patch | 42 ++++++++++++++++++++++ meta/recipes-devtools/python/python_2.7.9.bb | 1 + 2 files changed, 43 insertions(+) create mode 100644 meta/recipes-devtools/python/python/CVE-2016-5636.patch diff --git a/meta/recipes-devtools/python/python/CVE-2016-5636.patch b/meta/recipes-devtools/python/python/CVE-2016-5636.patch new file mode 100644 index 0000000000..5906153d31 --- /dev/null +++ b/meta/recipes-devtools/python/python/CVE-2016-5636.patch @@ -0,0 +1,42 @@ + +# HG changeset patch +# User Benjamin Peterson +# Date 1453357424 28800 +# Node ID 985fc64c60d6adffd1138b6cc46df388ca91ca5d +# Parent 7ec954b9fc54448a35b56d271340ba109eb381b9 +prevent buffer overflow in get_data (closes #26171) + +Upstream-Status: Backport +CVE: CVE-2016-5636 +Signed-off-by: Armin Kuster + +Index: Python-2.7.9/Misc/NEWS +=================================================================== +--- Python-2.7.9.orig/Misc/NEWS ++++ Python-2.7.9/Misc/NEWS +@@ -7,6 +7,9 @@ What's New in Python 2.7.9? + + *Release date: 2014-12-10* + ++- Issue #26171: Fix possible integer overflow and heap corruption in ++ zipimporter.get_data(). ++ + Library + ------- + +Index: Python-2.7.9/Modules/zipimport.c +=================================================================== +--- Python-2.7.9.orig/Modules/zipimport.c ++++ Python-2.7.9/Modules/zipimport.c +@@ -895,6 +895,11 @@ get_data(char *archive, PyObject *toc_en + PyMarshal_ReadShortFromFile(fp); /* local header size */ + file_offset += l; /* Start of file data */ + ++ if (data_size > LONG_MAX - 1) { ++ fclose(fp); ++ PyErr_NoMemory(); ++ return NULL; ++ } + raw_data = PyString_FromStringAndSize((char *)NULL, compress == 0 ? + data_size : data_size + 1); + if (raw_data == NULL) { diff --git a/meta/recipes-devtools/python/python_2.7.9.bb b/meta/recipes-devtools/python/python_2.7.9.bb index 53ec99181f..3b3e7ad707 100644 --- a/meta/recipes-devtools/python/python_2.7.9.bb +++ b/meta/recipes-devtools/python/python_2.7.9.bb @@ -27,6 +27,7 @@ SRC_URI += "\ file://use_sysroot_ncurses_instead_of_host.patch \ file://avoid_parallel_make_races_on_pgen.patch \ file://CVE-2016-0772.patch \ + file://CVE-2016-5636.patch \ " S = "${WORKDIR}/Python-${PV}" -- cgit 1.2.3-korg