summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/libtiff/files/CVE-2016-10268.patch30
-rw-r--r--meta/recipes-multimedia/libtiff/tiff_4.0.7.bb1
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-10268.patch b/meta/recipes-multimedia/libtiff/files/CVE-2016-10268.patch
new file mode 100644
index 0000000000..03b982a1d9
--- /dev/null
+++ b/meta/recipes-multimedia/libtiff/files/CVE-2016-10268.patch
@@ -0,0 +1,30 @@
1From 5397a417e61258c69209904e652a1f409ec3b9df Mon Sep 17 00:00:00 2001
2From: erouault <erouault>
3Date: Fri, 2 Dec 2016 22:13:32 +0000
4Subject: [PATCH] * tools/tiffcp.c: avoid uint32 underflow in cpDecodedStrips
5 that can cause various issues, such as buffer overflows in the library.
6 Reported by Agostino Sarubbo. Fixes
7 http://bugzilla.maptools.org/show_bug.cgi?id=2598
8
9Upstream-Status: Backport
10CVE: CVE-2016-10268
11Signed-off-by: Rajkumar Veer <rveer@mvista.com>
12
13---
14 ChangeLog | 7 +++++++
15 tools/tiffcp.c | 2 +-
16 2 files changed, 8 insertions(+), 1 deletion(-)
17
18Index: tiff-4.0.7/tools/tiffcp.c
19===================================================================
20--- tiff-4.0.7.orig/tools/tiffcp.c
21+++ tiff-4.0.7/tools/tiffcp.c
22@@ -985,7 +985,7 @@ DECLAREcpFunc(cpDecodedStrips)
23 tstrip_t s, ns = TIFFNumberOfStrips(in);
24 uint32 row = 0;
25 _TIFFmemset(buf, 0, stripsize);
26- for (s = 0; s < ns; s++) {
27+ for (s = 0; s < ns && row < imagelength; s++) {
28 tsize_t cc = (row + rowsperstrip > imagelength) ?
29 TIFFVStripSize(in, imagelength - row) : stripsize;
30 if (TIFFReadEncodedStrip(in, s, buf, cc) < 0
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.7.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.7.bb
index 5d816fc7ae..9432074d5a 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.0.7.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.0.7.bb
@@ -13,6 +13,7 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \
13 file://CVE-2017-11335.patch \ 13 file://CVE-2017-11335.patch \
14 file://CVE-2016-10271.patch \ 14 file://CVE-2016-10271.patch \
15 file://CVE-2016-10093.patch \ 15 file://CVE-2016-10093.patch \
16 file://CVE-2016-10268.patch \
16 " 17 "
17 18
18SRC_URI[md5sum] = "77ae928d2c6b7fb46a21c3a29325157b" 19SRC_URI[md5sum] = "77ae928d2c6b7fb46a21c3a29325157b"