python: Remove unused patches
CVE-2016-5636.patch and avoid_parallel_make_races_on_pgen.patch were
removed from SRC_URI as handled upstream in adf4266524
.
(From OE-Core rev: 53c0d1f18d4a11b0130e54466c91320acf4f5b18)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
82d817826c
commit
82311dcf1f
|
@ -1,44 +0,0 @@
|
|||
|
||||
# HG changeset patch
|
||||
# User Benjamin Peterson <benjamin@python.org>
|
||||
# Date 1453357424 28800
|
||||
# Node ID 985fc64c60d6adffd1138b6cc46df388ca91ca5d
|
||||
# Parent 7ec954b9fc54448a35b56d271340ba109eb381b9
|
||||
prevent buffer overflow in get_data (closes #26171)
|
||||
|
||||
Upstream-Status: Backport
|
||||
https://hg.python.org/cpython/rev/985fc64c60d6
|
||||
|
||||
CVE: CVE-2016-5636
|
||||
Signed-off-by: Armin Kuster <akuster@mvista.com>
|
||||
|
||||
Index: Python-2.7.11/Misc/NEWS
|
||||
===================================================================
|
||||
--- Python-2.7.11.orig/Misc/NEWS
|
||||
+++ Python-2.7.11/Misc/NEWS
|
||||
@@ -7,6 +7,9 @@ What's New in Python 2.7.11?
|
||||
|
||||
*Release date: 2015-12-05*
|
||||
|
||||
+- Issue #26171: Fix possible integer overflow and heap corruption in
|
||||
+ zipimporter.get_data().
|
||||
+
|
||||
Library
|
||||
-------
|
||||
|
||||
Index: Python-2.7.11/Modules/zipimport.c
|
||||
===================================================================
|
||||
--- Python-2.7.11.orig/Modules/zipimport.c
|
||||
+++ Python-2.7.11/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) {
|
|
@ -1,27 +0,0 @@
|
|||
Upstream-Status: Pending
|
||||
|
||||
Avoids parallel make races linking errors when making Parser/PGEN
|
||||
|
||||
- Implements Richard Purdie's idea
|
||||
|
||||
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
|
||||
|
||||
Index: Python-2.7.9/Makefile.pre.in
|
||||
===================================================================
|
||||
--- Python-2.7.9.orig/Makefile.pre.in
|
||||
+++ Python-2.7.9/Makefile.pre.in
|
||||
@@ -611,12 +611,10 @@ Modules/grpmodule.o: $(srcdir)/Modules/g
|
||||
|
||||
Modules/pwdmodule.o: $(srcdir)/Modules/pwdmodule.c $(srcdir)/Modules/posixmodule.h
|
||||
|
||||
-$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS)
|
||||
+$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) $(PGEN)
|
||||
@$(MKDIR_P) Include
|
||||
- $(MAKE) $(PGEN)
|
||||
$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
|
||||
$(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS)
|
||||
- $(MAKE) $(GRAMMAR_H)
|
||||
touch $(GRAMMAR_C)
|
||||
|
||||
$(PGEN): $(PGENOBJS)
|
Loading…
Reference in New Issue