sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

tiff: Secruity fix CVE-2016-10093 

(From OE-Core rev: a34da9ea14275d0bf8e9f2b7df7416fe622770cb)

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>
This commit is contained in:
Rajkumar Veer 2017-11-03 21:39:26 -07:00 committed by Richard Purdie
parent 18a0ad760c
commit ca16811eed
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
meta/recipes-multimedia/libtiff/files/CVE-2016-10093.patch Normal file
View File

@ -0,0 +1,47 @@
From 787c0ee906430b772f33ca50b97b8b5ca070faec Mon Sep 17 00:00:00 2001
From: erouault <erouault>
Date: Sat, 3 Dec 2016 16:40:01 +0000
Subject: [PATCH] * tools/tiffcp.c: fix uint32 underflow/overflow that can
cause heap-based buffer overflow. Reported by Agostino Sarubbo. Fixes
http://bugzilla.maptools.org/show_bug.cgi?id=2610
Upstream-Status: Backport
CVE: CVE-2016-10093
Signed-off-by: Rajkumar Veer <rveer@mvista.com>
---
ChangeLog | 7 +++++++
tools/tiffcp.c | 6 +++---
2 files changed, 10 insertions(+), 3 deletions(-)
Index: tiff-4.0.7/tools/tiffcp.c
===================================================================
--- tiff-4.0.7.orig/tools/tiffcp.c
+++ tiff-4.0.7/tools/tiffcp.c
@@ -1163,7 +1163,7 @@ bad:
static void
cpStripToTile(uint8* out, uint8* in,
- uint32 rows, uint32 cols, int outskew, int inskew)
+ uint32 rows, uint32 cols, int outskew, int64 inskew)
{
while (rows-- > 0) {
uint32 j = cols;
@@ -1320,7 +1320,7 @@ DECLAREreadFunc(readContigTilesIntoBuffe
tdata_t tilebuf;
uint32 imagew = TIFFScanlineSize(in);
uint32 tilew = TIFFTileRowSize(in);
- int iskew = imagew - tilew;
+ int64 iskew = (int64)imagew - (int64)tilew;
uint8* bufp = (uint8*) buf;
uint32 tw, tl;
uint32 row;
@@ -1348,7 +1348,7 @@ DECLAREreadFunc(readContigTilesIntoBuffe
status = 0;
goto done;
}
- if (colb + tilew > imagew) {
+ if (colb > iskew) {
uint32 width = imagew - colb;
uint32 oskew = tilew - width;
cpStripToTile(bufp + colb,

1
meta/recipes-multimedia/libtiff/tiff_4.0.7.bb
View File

@ -12,6 +12,7 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \
file://CVE-2017-10688.patch \
file://CVE-2017-11335.patch \
file://CVE-2016-10271.patch \
file://CVE-2016-10093.patch \
"
SRC_URI[md5sum] = "77ae928d2c6b7fb46a21c3a29325157b"