diff options
author | Rajkumar Veer <rveer@mvista.com> | 2017-11-03 21:39:26 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-21 14:43:53 +0000 |
commit | 776791238d06dbe5546921d2d99a29e151aa06e0 (patch) | |
tree | 609cd15a52f27dd4a12fdbaf3119a4a5757cf714 /meta | |
parent | bef8d0ed3959b850f2520934c16d1e97dc18c04f (diff) | |
download | poky-776791238d06dbe5546921d2d99a29e151aa06e0.tar.gz |
tiff: Secruity fix CVE-2016-10093
(From OE-Core rev: 6e39b24d003fb4e702097a01142fcfe2861593dd)
Signed-off-by: Rajkumar Veer <rveer@mvista.com>
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-multimedia/libtiff/files/CVE-2016-10093.patch | 47 | ||||
-rw-r--r-- | meta/recipes-multimedia/libtiff/tiff_4.0.7.bb | 1 |
2 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-10093.patch b/meta/recipes-multimedia/libtiff/files/CVE-2016-10093.patch new file mode 100644 index 0000000000..e09bb7fd21 --- /dev/null +++ b/meta/recipes-multimedia/libtiff/files/CVE-2016-10093.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From 787c0ee906430b772f33ca50b97b8b5ca070faec Mon Sep 17 00:00:00 2001 | ||
2 | From: erouault <erouault> | ||
3 | Date: Sat, 3 Dec 2016 16:40:01 +0000 | ||
4 | Subject: [PATCH] * tools/tiffcp.c: fix uint32 underflow/overflow that can | ||
5 | cause heap-based buffer overflow. Reported by Agostino Sarubbo. Fixes | ||
6 | http://bugzilla.maptools.org/show_bug.cgi?id=2610 | ||
7 | |||
8 | Upstream-Status: Backport | ||
9 | CVE: CVE-2016-10093 | ||
10 | Signed-off-by: Rajkumar Veer <rveer@mvista.com> | ||
11 | |||
12 | --- | ||
13 | ChangeLog | 7 +++++++ | ||
14 | tools/tiffcp.c | 6 +++--- | ||
15 | 2 files changed, 10 insertions(+), 3 deletions(-) | ||
16 | |||
17 | Index: tiff-4.0.7/tools/tiffcp.c | ||
18 | =================================================================== | ||
19 | --- tiff-4.0.7.orig/tools/tiffcp.c | ||
20 | +++ tiff-4.0.7/tools/tiffcp.c | ||
21 | @@ -1163,7 +1163,7 @@ bad: | ||
22 | |||
23 | static void | ||
24 | cpStripToTile(uint8* out, uint8* in, | ||
25 | - uint32 rows, uint32 cols, int outskew, int inskew) | ||
26 | + uint32 rows, uint32 cols, int outskew, int64 inskew) | ||
27 | { | ||
28 | while (rows-- > 0) { | ||
29 | uint32 j = cols; | ||
30 | @@ -1320,7 +1320,7 @@ DECLAREreadFunc(readContigTilesIntoBuffe | ||
31 | tdata_t tilebuf; | ||
32 | uint32 imagew = TIFFScanlineSize(in); | ||
33 | uint32 tilew = TIFFTileRowSize(in); | ||
34 | - int iskew = imagew - tilew; | ||
35 | + int64 iskew = (int64)imagew - (int64)tilew; | ||
36 | uint8* bufp = (uint8*) buf; | ||
37 | uint32 tw, tl; | ||
38 | uint32 row; | ||
39 | @@ -1348,7 +1348,7 @@ DECLAREreadFunc(readContigTilesIntoBuffe | ||
40 | status = 0; | ||
41 | goto done; | ||
42 | } | ||
43 | - if (colb + tilew > imagew) { | ||
44 | + if (colb > iskew) { | ||
45 | uint32 width = imagew - colb; | ||
46 | uint32 oskew = tilew - width; | ||
47 | cpStripToTile(bufp + colb, | ||
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.7.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.7.bb index 48f7986698..5d816fc7ae 100644 --- a/meta/recipes-multimedia/libtiff/tiff_4.0.7.bb +++ b/meta/recipes-multimedia/libtiff/tiff_4.0.7.bb | |||
@@ -12,6 +12,7 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ | |||
12 | file://CVE-2017-10688.patch \ | 12 | file://CVE-2017-10688.patch \ |
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 | " | 16 | " |
16 | 17 | ||
17 | SRC_URI[md5sum] = "77ae928d2c6b7fb46a21c3a29325157b" | 18 | SRC_URI[md5sum] = "77ae928d2c6b7fb46a21c3a29325157b" |