summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/libtiff/files/CVE-2015-8784.patch
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2016-12-10 09:38:43 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-11 17:21:45 +0000
commitbaf73313b3f63537853278992fa7c00775a6eff4 (patch)
treed5983f67c33f88b81df914f0cfbf5883d4de4877 /meta/recipes-multimedia/libtiff/files/CVE-2015-8784.patch
parent985beaaa1309a97d42aa0f886096db041060a95e (diff)
downloadpoky-baf73313b3f63537853278992fa7c00775a6eff4.tar.gz
libtiff: Update to 4.0.7
Major changes: The libtiff tools bmp2tiff, gif2tiff, ras2tiff, sgi2tiff, sgisv, and ycbcr are completely removed from the distribution, used for demos. CVEs fixed: CVE-2016-9297 CVE-2016-9448 CVE-2016-9273 CVE-2014-8127 CVE-2016-3658 CVE-2016-5875 CVE-2016-5652 CVE-2016-3632 plus more that are not identified in the changelog. removed patches integrated into update. more info: http://libtiff.maptools.org/v4.0.7.html (From OE-Core rev: 9945cbccc4c737c84ad441773061acbf90c7baed) (From OE-Core rev: 009b330591b27bd14d4c8ceb767c78fd7eb924fd) Signed-off-by: Armin Kuster <akuster808@gmail.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>
Diffstat (limited to 'meta/recipes-multimedia/libtiff/files/CVE-2015-8784.patch')
-rw-r--r--meta/recipes-multimedia/libtiff/files/CVE-2015-8784.patch73
1 files changed, 0 insertions, 73 deletions
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2015-8784.patch b/meta/recipes-multimedia/libtiff/files/CVE-2015-8784.patch
deleted file mode 100644
index 0caf800e23..0000000000
--- a/meta/recipes-multimedia/libtiff/files/CVE-2015-8784.patch
+++ /dev/null
@@ -1,73 +0,0 @@
1From b18012dae552f85dcc5c57d3bf4e997a15b1cc1c Mon Sep 17 00:00:00 2001
2From: erouault <erouault>
3Date: Sun, 27 Dec 2015 16:55:20 +0000
4Subject: [PATCH] * libtiff/tif_next.c: fix potential out-of-bound write in
5 NeXTDecode() triggered by http://lcamtuf.coredump.cx/afl/vulns/libtiff5.tif
6 (bugzilla #2508)
7
8Upstream-Status: Backport
9https://github.com/vadz/libtiff/commit/b18012dae552f85dcc5c57d3bf4e997a15b1cc1c
10hand applied Changelog changes
11
12CVE: CVE-2015-8784
13Signed-off-by: Armin Kuster <akuster@mvista.com>
14
15---
16 ChangeLog | 6 ++++++
17 libtiff/tif_next.c | 10 ++++++++--
18 2 files changed, 14 insertions(+), 2 deletions(-)
19
20Index: tiff-4.0.4/ChangeLog
21===================================================================
22--- tiff-4.0.4.orig/ChangeLog
23+++ tiff-4.0.4/ChangeLog
24@@ -1,5 +1,11 @@
25 2015-12-27 Even Rouault <even.rouault at spatialys.com>
26
27+ * libtiff/tif_next.c: fix potential out-of-bound write in NeXTDecode()
28+ triggered by http://lcamtuf.coredump.cx/afl/vulns/libtiff5.tif
29+ (bugzilla #2508)
30+
31+2015-12-27 Even Rouault <even.rouault at spatialys.com>
32+
33 * libtiff/tif_luv.c: fix potential out-of-bound writes in decode
34 functions in non debug builds by replacing assert()s by regular if
35 checks (bugzilla #2522).
36Index: tiff-4.0.4/libtiff/tif_next.c
37===================================================================
38--- tiff-4.0.4.orig/libtiff/tif_next.c
39+++ tiff-4.0.4/libtiff/tif_next.c
40@@ -37,7 +37,7 @@
41 case 0: op[0] = (unsigned char) ((v) << 6); break; \
42 case 1: op[0] |= (v) << 4; break; \
43 case 2: op[0] |= (v) << 2; break; \
44- case 3: *op++ |= (v); break; \
45+ case 3: *op++ |= (v); op_offset++; break; \
46 } \
47 }
48
49@@ -106,6 +106,7 @@ NeXTDecode(TIFF* tif, uint8* buf, tmsize
50 uint32 imagewidth = tif->tif_dir.td_imagewidth;
51 if( isTiled(tif) )
52 imagewidth = tif->tif_dir.td_tilewidth;
53+ tmsize_t op_offset = 0;
54
55 /*
56 * The scanline is composed of a sequence of constant
57@@ -122,10 +123,15 @@ NeXTDecode(TIFF* tif, uint8* buf, tmsize
58 * bounds, potentially resulting in a security
59 * issue.
60 */
61- while (n-- > 0 && npixels < imagewidth)
62+ while (n-- > 0 && npixels < imagewidth && op_offset < scanline)
63 SETPIXEL(op, grey);
64 if (npixels >= imagewidth)
65 break;
66+ if (op_offset >= scanline ) {
67+ TIFFErrorExt(tif->tif_clientdata, module, "Invalid data for scanline %ld",
68+ (long) tif->tif_row);
69+ return (0);
70+ }
71 if (cc == 0)
72 goto bad;
73 n = *bp++, cc--;