mirror of
https://git.yoctoproject.org/poky
synced 2026-02-05 16:28:43 +01:00
python3: Remove unused patches
CVE-2016-5636.patch and use_packed_importlib.patch were removed from
SRC_URI as handled in upstream in b192bc02bb.
(From OE-Core rev: 71c539483350a4b45fb5d397d29b6ebcfc863e2f)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
3d0ac9b8af
commit
82d817826c
@@ -1,44 +0,0 @@
|
||||
|
||||
# HG changeset patch
|
||||
# User Benjamin Peterson <benjamin@python.org>
|
||||
# Date 1453357506 28800
|
||||
# Node ID 10dad6da1b28ea4af78ad9529e469fdbf4ebbc8f
|
||||
# Parent a3ac2cd93db9d5336dfd7b5b27efde2c568d8794# Parent 01ddd608b85c85952537d95a43bbabf4fb655057
|
||||
merge 3.4 (#26171)
|
||||
|
||||
Upstream-Status: Backport
|
||||
CVE: CVE-2016-5636
|
||||
|
||||
https://hg.python.org/cpython/raw-rev/10dad6da1b28
|
||||
Signed-off-by: Armin Kuster <akuster@mvista.com>
|
||||
|
||||
Index: Python-3.5.1/Misc/NEWS
|
||||
===================================================================
|
||||
--- Python-3.5.1.orig/Misc/NEWS
|
||||
+++ Python-3.5.1/Misc/NEWS
|
||||
@@ -91,6 +91,9 @@ Core and Builtins
|
||||
Python.h header to fix a compilation error with OpenMP. PyThreadState_GET()
|
||||
becomes an alias to PyThreadState_Get() to avoid ABI incompatibilies.
|
||||
|
||||
+- Issue #26171: Fix possible integer overflow and heap corruption in
|
||||
+ zipimporter.get_data().
|
||||
+
|
||||
Library
|
||||
-------
|
||||
|
||||
Index: Python-3.5.1/Modules/zipimport.c
|
||||
===================================================================
|
||||
--- Python-3.5.1.orig/Modules/zipimport.c
|
||||
+++ Python-3.5.1/Modules/zipimport.c
|
||||
@@ -1112,6 +1112,11 @@ get_data(PyObject *archive, PyObject *to
|
||||
}
|
||||
file_offset += l; /* Start of file data */
|
||||
|
||||
+ if (data_size > LONG_MAX - 1) {
|
||||
+ fclose(fp);
|
||||
+ PyErr_NoMemory();
|
||||
+ return NULL;
|
||||
+ }
|
||||
bytes_size = compress == 0 ? data_size : data_size + 1;
|
||||
if (bytes_size == 0)
|
||||
bytes_size++;
|
||||
@@ -1,31 +0,0 @@
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
The binary _freeze_importlib is built and also used during build time to generate
|
||||
importlib*.h files, this is impossible to do on a cross-compile environment,
|
||||
this avoids executing the binary and forces it to use the packed importlib*.h files.
|
||||
|
||||
|
||||
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
|
||||
|
||||
Index: Python-3.5.0/Makefile.pre.in
|
||||
===================================================================
|
||||
--- Python-3.5.0.orig/Makefile.pre.in
|
||||
+++ Python-3.5.0/Makefile.pre.in
|
||||
@@ -700,12 +700,12 @@ Programs/_freeze_importlib.o: Programs/_
|
||||
Programs/_freeze_importlib: Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN)
|
||||
$(LINKCC) $(PY_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
|
||||
|
||||
-Python/importlib_external.h: $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib
|
||||
- ./Programs/_freeze_importlib \
|
||||
+#Python/importlib_external.h: $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib
|
||||
+# ./Programs/_freeze_importlib \
|
||||
$(srcdir)/Lib/importlib/_bootstrap_external.py Python/importlib_external.h
|
||||
|
||||
-Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib
|
||||
- ./Programs/_freeze_importlib \
|
||||
+#Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib
|
||||
+# ./Programs/_freeze_importlib \
|
||||
$(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h
|
||||
|
||||
|
||||
Reference in New Issue
Block a user