diff options
Diffstat (limited to 'meta/recipes-devtools/python')
-rw-r--r-- | meta/recipes-devtools/python/python3/CVE-2016-5636.patch | 44 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3/use_packed_importlib.patch | 31 |
2 files changed, 0 insertions, 75 deletions
diff --git a/meta/recipes-devtools/python/python3/CVE-2016-5636.patch b/meta/recipes-devtools/python/python3/CVE-2016-5636.patch deleted file mode 100644 index 0d494d20f4..0000000000 --- a/meta/recipes-devtools/python/python3/CVE-2016-5636.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | |||
2 | # HG changeset patch | ||
3 | # User Benjamin Peterson <benjamin@python.org> | ||
4 | # Date 1453357506 28800 | ||
5 | # Node ID 10dad6da1b28ea4af78ad9529e469fdbf4ebbc8f | ||
6 | # Parent a3ac2cd93db9d5336dfd7b5b27efde2c568d8794# Parent 01ddd608b85c85952537d95a43bbabf4fb655057 | ||
7 | merge 3.4 (#26171) | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | CVE: CVE-2016-5636 | ||
11 | |||
12 | https://hg.python.org/cpython/raw-rev/10dad6da1b28 | ||
13 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
14 | |||
15 | Index: Python-3.5.1/Misc/NEWS | ||
16 | =================================================================== | ||
17 | --- Python-3.5.1.orig/Misc/NEWS | ||
18 | +++ Python-3.5.1/Misc/NEWS | ||
19 | @@ -91,6 +91,9 @@ Core and Builtins | ||
20 | Python.h header to fix a compilation error with OpenMP. PyThreadState_GET() | ||
21 | becomes an alias to PyThreadState_Get() to avoid ABI incompatibilies. | ||
22 | |||
23 | +- Issue #26171: Fix possible integer overflow and heap corruption in | ||
24 | + zipimporter.get_data(). | ||
25 | + | ||
26 | Library | ||
27 | ------- | ||
28 | |||
29 | Index: Python-3.5.1/Modules/zipimport.c | ||
30 | =================================================================== | ||
31 | --- Python-3.5.1.orig/Modules/zipimport.c | ||
32 | +++ Python-3.5.1/Modules/zipimport.c | ||
33 | @@ -1112,6 +1112,11 @@ get_data(PyObject *archive, PyObject *to | ||
34 | } | ||
35 | file_offset += l; /* Start of file data */ | ||
36 | |||
37 | + if (data_size > LONG_MAX - 1) { | ||
38 | + fclose(fp); | ||
39 | + PyErr_NoMemory(); | ||
40 | + return NULL; | ||
41 | + } | ||
42 | bytes_size = compress == 0 ? data_size : data_size + 1; | ||
43 | if (bytes_size == 0) | ||
44 | bytes_size++; | ||
diff --git a/meta/recipes-devtools/python/python3/use_packed_importlib.patch b/meta/recipes-devtools/python/python3/use_packed_importlib.patch deleted file mode 100644 index 70708a0adc..0000000000 --- a/meta/recipes-devtools/python/python3/use_packed_importlib.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | |||
2 | Upstream-Status: Inappropriate [embedded specific] | ||
3 | |||
4 | The binary _freeze_importlib is built and also used during build time to generate | ||
5 | importlib*.h files, this is impossible to do on a cross-compile environment, | ||
6 | this avoids executing the binary and forces it to use the packed importlib*.h files. | ||
7 | |||
8 | |||
9 | Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | ||
10 | |||
11 | Index: Python-3.5.0/Makefile.pre.in | ||
12 | =================================================================== | ||
13 | --- Python-3.5.0.orig/Makefile.pre.in | ||
14 | +++ Python-3.5.0/Makefile.pre.in | ||
15 | @@ -700,12 +700,12 @@ Programs/_freeze_importlib.o: Programs/_ | ||
16 | Programs/_freeze_importlib: Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) | ||
17 | $(LINKCC) $(PY_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) | ||
18 | |||
19 | -Python/importlib_external.h: $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib | ||
20 | - ./Programs/_freeze_importlib \ | ||
21 | +#Python/importlib_external.h: $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib | ||
22 | +# ./Programs/_freeze_importlib \ | ||
23 | $(srcdir)/Lib/importlib/_bootstrap_external.py Python/importlib_external.h | ||
24 | |||
25 | -Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib | ||
26 | - ./Programs/_freeze_importlib \ | ||
27 | +#Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib | ||
28 | +# ./Programs/_freeze_importlib \ | ||
29 | $(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h | ||
30 | |||
31 | |||