summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2016-10-26 08:26:45 (GMT)
committerSona Sarmadi <sona.sarmadi@enea.com>2017-02-10 11:21:38 (GMT)
commit18ee418df8af1a0a83b8262d3f86a8b147044821 (patch)
tree97ca6964990c89b92c490992de512e2d6292ad47
parent0cd1402261230582460b6a6f36d0a368c6fc1779 (diff)
downloadpoky-18ee418df8af1a0a83b8262d3f86a8b147044821.tar.gz
tiff: Security fix CVE-2016-3990
CVE-2016-3990 libtiff: Heap-based buffer overflow in the horizontalDifference8 function in tif_pixarlog.c in LibTIFF 4.0.6 and earlier allows remote attackers to cause a denial of service (crash) or execute arbitrary code via a crafted TIFF image to tiffcp. External References: https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-3990 http://bugzilla.maptools.org/show_bug.cgi?id=2544 Patch from: https://github.com/vadz/libtiff/commit/6a4dbb07ccf92836bb4adac7be4575672d0ac5f1 (From OE-Core rev: c6492563037bcdf7f9cc50c8639f7b6ace261e62) (From OE-Core rev: d7165cd738ac181fb29d2425e360f2734b0d1107) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
-rw-r--r--meta/recipes-multimedia/libtiff/files/CVE-2016-3990.patch66
-rw-r--r--meta/recipes-multimedia/libtiff/tiff_4.0.6.bb1
2 files changed, 67 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-3990.patch b/meta/recipes-multimedia/libtiff/files/CVE-2016-3990.patch
new file mode 100644
index 0000000..7bf52ee
--- /dev/null
+++ b/meta/recipes-multimedia/libtiff/files/CVE-2016-3990.patch
@@ -0,0 +1,66 @@
1From 6a4dbb07ccf92836bb4adac7be4575672d0ac5f1 Mon Sep 17 00:00:00 2001
2From: erouault <erouault>
3Date: Mon, 15 Aug 2016 20:49:48 +0000
4Subject: [PATCH] * libtiff/tif_pixarlog.c: Fix write buffer overflow in
5 PixarLogEncode if more input samples are provided than expected by
6 PixarLogSetupEncode. Idea based on libtiff-CVE-2016-3990.patch from
7 libtiff-4.0.3-25.el7_2.src.rpm by Nikola Forro, but with different and
8 simpler check. (bugzilla #2544)
9
10invalid tests that rejected valid files. (bugzilla #2545)
11
12CVE: CVE-2016-3990
13Upstream-Status: Backport
14https://github.com/vadz/libtiff/commit/6a4dbb07ccf92836bb4adac7be4575672d0ac5f1
15
16Signed-off-by: Yi Zhao <yi.zhao@windirver.com>
17---
18 ChangeLog | 10 +++++++++-
19 libtiff/tif_pixarlog.c | 7 +++++++
20 2 files changed, 16 insertions(+), 1 deletion(-)
21
22diff --git a/ChangeLog b/ChangeLog
23index 9c0ab29..db4ea18 100644
24--- a/ChangeLog
25+++ b/ChangeLog
26@@ -1,10 +1,18 @@
27 2016-08-15 Even Rouault <even.rouault at spatialys.com>
28
29+ * libtiff/tif_pixarlog.c: Fix write buffer overflow in PixarLogEncode
30+ if more input samples are provided than expected by PixarLogSetupEncode.
31+ Idea based on libtiff-CVE-2016-3990.patch from
32+ libtiff-4.0.3-25.el7_2.src.rpm by Nikola Forro, but with different and
33+ simpler check. (bugzilla #2544)
34+
35+2016-08-15 Even Rouault <even.rouault at spatialys.com>
36+
37 * tools/tiff2rgba.c: Fix integer overflow in size of allocated
38 buffer, when -b mode is enabled, that could result in out-of-bounds
39 write. Based initially on patch tiff-CVE-2016-3945.patch from
40 libtiff-4.0.3-25.el7_2.src.rpm by Nikola Forro, with correction for
41- invalid tests that rejected valid files.
42+ invalid tests that rejected valid files. (bugzilla #2545)
43
44 2016-07-11 Even Rouault <even.rouault at spatialys.com>
45
46diff --git a/libtiff/tif_pixarlog.c b/libtiff/tif_pixarlog.c
47index e78f788..28329d1 100644
48--- a/libtiff/tif_pixarlog.c
49+++ b/libtiff/tif_pixarlog.c
50@@ -1141,6 +1141,13 @@ PixarLogEncode(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
51 }
52
53 llen = sp->stride * td->td_imagewidth;
54+ /* Check against the number of elements (of size uint16) of sp->tbuf */
55+ if( n > td->td_rowsperstrip * llen )
56+ {
57+ TIFFErrorExt(tif->tif_clientdata, module,
58+ "Too many input bytes provided");
59+ return 0;
60+ }
61
62 for (i = 0, up = sp->tbuf; i < n; i += llen, up += llen) {
63 switch (sp->user_datafmt) {
64--
652.7.4
66
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
index b978528..dfb2996 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
@@ -11,6 +11,7 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \
11 file://CVE-2016-5321.patch \ 11 file://CVE-2016-5321.patch \
12 file://CVE-2016-5323.patch \ 12 file://CVE-2016-5323.patch \
13 file://CVE-2016-3945.patch \ 13 file://CVE-2016-3945.patch \
14 file://CVE-2016-3990.patch \
14 " 15 "
15 16
16SRC_URI[md5sum] = "d1d2e940dea0b5ad435f21f03d96dd72" 17SRC_URI[md5sum] = "d1d2e940dea0b5ad435f21f03d96dd72"