mirror of
git://git.yoctoproject.org/poky
synced 2026-09-26 23:23:10 +00:00
c95d42a7d1
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: 35a7cb62be554e28f64b7583d46d693ea184491f)
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
(cherry picked from commit 4a167cfb6ad79bbe2a2ff7f7b43c4a162ca42a4d)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
46 lines
1.8 KiB
Diff
46 lines
1.8 KiB
Diff
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>
|
|
---
|
|
tools/tiffcrop.c | 2 +-
|
|
2 files changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
Index: tiff-4.0.4/tools/tiffcrop.c
|
|
===================================================================
|
|
--- tiff-4.0.4.orig/tools/tiffcrop.c
|
|
+++ tiff-4.0.4/tools/tiffcrop.c
|
|
@@ -989,7 +989,7 @@ static int readSeparateTilesIntoBuffer
|
|
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)
|
|
Index: tiff-4.0.4/ChangeLog
|
|
===================================================================
|
|
--- tiff-4.0.4.orig/ChangeLog
|
|
+++ tiff-4.0.4/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-26 Even Rouault <even.rouault at spatialys.com>
|
|
|
|
* libtiff/tif_getimage.c: fix out-of-bound reads in TIFFRGBAImage
|