tiff: Security fix CVE-2016-5321
CVE-2016-5321 libtiff: a maliciously crafted TIFF file could cause the
application to crash when using tiffcrop command
External References:
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-5321
http://bugzilla.maptools.org/show_bug.cgi?id=2558
Patch from:
d9783e4a14
(From OE-Core rev: 4a167cfb6ad79bbe2a2ff7f7b43c4a162ca42a4d)
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>
This commit is contained in:
parent
b762eb937c
commit
1b03beb80a
|
@ -0,0 +1,49 @@
|
|||
From d9783e4a1476b6787a51c5ae9e9b3156527589f0 Mon Sep 17 00:00:00 2001
|
||||
From: erouault <erouault>
|
||||
Date: Mon, 11 Jul 2016 21:26:03 +0000
|
||||
Subject: [PATCH 1/2] * tools/tiffcrop.c: Avoid access outside of stack
|
||||
allocated array on a tiled separate TIFF with more than 8 samples per pixel.
|
||||
Reported by Kaixiang Zhang of the Cloud Security Team, Qihoo 360
|
||||
(CVE-2016-5321, bugzilla #2558)
|
||||
|
||||
CVE: CVE-2016-5321
|
||||
Upstream-Status: Backport
|
||||
https://github.com/vadz/libtiff/commit/d9783e4a1476b6787a51c5ae9e9b3156527589f0
|
||||
|
||||
Signed-off-by: Yi Zhao <yi.zhao@windirver.com>
|
||||
---
|
||||
ChangeLog | 7 +++++++
|
||||
tools/tiffcrop.c | 2 +-
|
||||
2 files changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/ChangeLog b/ChangeLog
|
||||
index e98d54d..4e0302f 100644
|
||||
--- a/ChangeLog
|
||||
+++ b/ChangeLog
|
||||
@@ -1,3 +1,10 @@
|
||||
+2016-07-11 Even Rouault <even.rouault at spatialys.com>
|
||||
+
|
||||
+ * tools/tiffcrop.c: Avoid access outside of stack allocated array
|
||||
+ on a tiled separate TIFF with more than 8 samples per pixel.
|
||||
+ Reported by Kaixiang Zhang of the Cloud Security Team, Qihoo 360
|
||||
+ (CVE-2016-5321, bugzilla #2558)
|
||||
+
|
||||
2015-12-27 Even Rouault <even.rouault at spatialys.com>
|
||||
|
||||
* libtiff/tif_next.c: fix potential out-of-bound write in NeXTDecode()
|
||||
diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
|
||||
index d959ae3..6fc8fc1 100644
|
||||
--- a/tools/tiffcrop.c
|
||||
+++ b/tools/tiffcrop.c
|
||||
@@ -989,7 +989,7 @@ static int readSeparateTilesIntoBuffer (TIFF* in, uint8 *obuf,
|
||||
nrow = (row + tl > imagelength) ? imagelength - row : tl;
|
||||
for (col = 0; col < imagewidth; col += tw)
|
||||
{
|
||||
- for (s = 0; s < spp; s++)
|
||||
+ for (s = 0; s < spp && s < MAX_SAMPLES; s++)
|
||||
{ /* Read each plane of a tile set into srcbuffs[s] */
|
||||
tbytes = TIFFReadTile(in, srcbuffs[s], col, row, 0, s);
|
||||
if (tbytes < 0 && !ignore)
|
||||
--
|
||||
2.7.4
|
||||
|
|
@ -9,6 +9,7 @@ SRC_URI = "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${PV}.tar.gz \
|
|||
file://CVE-2015-8781.patch \
|
||||
file://CVE-2015-8784.patch \
|
||||
file://CVE-2016-3186.patch \
|
||||
file://CVE-2016-5321.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "d1d2e940dea0b5ad435f21f03d96dd72"
|
||||
|
|
Loading…
Reference in New Issue