summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch39
-rw-r--r--meta/recipes-multimedia/libtiff/tiff_4.0.9.bb1
2 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch b/meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch
new file mode 100644
index 0000000000..7252298b52
--- /dev/null
+++ b/meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch
@@ -0,0 +1,39 @@
1From de144fd228e4be8aa484c3caf3d814b6fa88c6d9 Mon Sep 17 00:00:00 2001
2From: Even Rouault <even.rouault@spatialys.com>
3Date: Sat, 12 May 2018 14:24:15 +0200
4Subject: [PATCH] TIFFWriteDirectorySec: avoid assertion. Fixes
5 http://bugzilla.maptools.org/show_bug.cgi?id=2795.
6 CVE-2018-10963
7
8---
9CVE: CVE-2018-10963
10
11Upstream-Status: Backport [gitlab.com/libtiff/libtiff/commit/de144f...]
12
13Signed-off-by: Joe Slater <joe.slater@windriver.com>
14
15---
16 libtiff/tif_dirwrite.c | 7 +++++--
17 1 file changed, 5 insertions(+), 2 deletions(-)
18
19diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c
20index 2430de6..c15a28d 100644
21--- a/libtiff/tif_dirwrite.c
22+++ b/libtiff/tif_dirwrite.c
23@@ -695,8 +695,11 @@ TIFFWriteDirectorySec(TIFF* tif, int isimage, int imagedone, uint64* pdiroff)
24 }
25 break;
26 default:
27- assert(0); /* we should never get here */
28- break;
29+ TIFFErrorExt(tif->tif_clientdata,module,
30+ "Cannot write tag %d (%s)",
31+ TIFFFieldTag(o),
32+ o->field_name ? o->field_name : "unknown");
33+ goto bad;
34 }
35 }
36 }
37--
381.7.9.5
39
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
index 8c3bba5c64..e8e2a119f1 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
@@ -9,6 +9,7 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \
9 file://CVE-2017-9935.patch \ 9 file://CVE-2017-9935.patch \
10 file://CVE-2017-18013.patch \ 10 file://CVE-2017-18013.patch \
11 file://CVE-2018-5784.patch \ 11 file://CVE-2018-5784.patch \
12 file://CVE-2018-10963.patch \
12 " 13 "
13 14
14SRC_URI[md5sum] = "54bad211279cc93eb4fca31ba9bfdc79" 15SRC_URI[md5sum] = "54bad211279cc93eb4fca31ba9bfdc79"