030fe340af
Add upstream post-4.0.7 commits (except for ChangeLog modifications) fixing the following security issues: CVE-2016-10266 - LibTIFF 4.0.7 allows remote attackers to cause a denial of service (divide-by-zero error and application crash) via a crafted TIFF image, related to libtiff/tif_read.c:351:22. CVE-2016-10267 - LibTIFF 4.0.7 allows remote attackers to cause a denial of service (divide-by-zero error and application crash) via a crafted TIFF image, related to libtiff/tif_ojpeg.c:816:8. CVE-2016-10269 - LibTIFF 4.0.7 allows remote attackers to cause a denial of service (heap-based buffer over-read) or possibly have unspecified other impact via a crafted TIFF image, related to "READ of size 512" and libtiff/tif_unix.c:340:2. CVE-2016-10270 - LibTIFF 4.0.7 allows remote attackers to cause a denial of service (heap-based buffer over-read) or possibly have unspecified other impact via a crafted TIFF image, related to "READ of size 8" and libtiff/tif_read.c:523:22. CVE-2017-5225 - LibTIFF version 4.0.7 is vulnerable to a heap buffer overflow in the tools/tiffcp resulting in DoS or code execution via a crafted BitsPerSample value. CVE-2017-7592 - The putagreytile function in tif_getimage.c in LibTIFF 4.0.7 has a left-shift undefined behavior issue, which might allow remote attackers to cause a denial of service (application crash) or possibly have unspecified other impact via a crafted image. CVE-2017-7593 - tif_read.c in LibTIFF 4.0.7 does not ensure that tif_rawdata is properly initialized, which might allow remote attackers to obtain sensitive information from process memory via a crafted image. CVE-2017-7594 - The OJPEGReadHeaderInfoSecTablesDcTable function in tif_ojpeg.c in LibTIFF 4.0.7 allows remote attackers to cause a denial of service (memory leak) via a crafted image. CVE-2017-7595 - The JPEGSetupEncode function in tiff_jpeg.c in LibTIFF 4.0.7 allows remote attackers to cause a denial of service (divide-by-zero error and application crash) via a crafted image. CVE-2017-7598 - tif_dirread.c in LibTIFF 4.0.7 might allow remote attackers to cause a denial of service (divide-by-zero error and application crash) via a crafted image. CVE-2017-7601 - LibTIFF 4.0.7 has a "shift exponent too large for 64-bit type long" undefined behavior issue, which might allow remote attackers to cause a denial of service (application crash) or possibly have unspecified other impact via a crafted image. CVE-2017-7602 - LibTIFF 4.0.7 has a signed integer overflow, which might allow remote attackers to cause a denial of service (application crash) or possibly have unspecified other impact via a crafted image. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
57 lines
1.8 KiB
Diff
57 lines
1.8 KiB
Diff
From 66e7bd59520996740e4df5495a830b42fae48bc4 Mon Sep 17 00:00:00 2001
|
|
From: erouault <erouault>
|
|
Date: Wed, 11 Jan 2017 16:33:34 +0000
|
|
Subject: [PATCH] * libtiff/tif_read.c: avoid potential undefined behaviour on
|
|
signed integer addition in TIFFReadRawStrip1() in isMapped() case. Fixes
|
|
http://bugzilla.maptools.org/show_bug.cgi?id=2650
|
|
|
|
Fixes CVE-2017-7602
|
|
|
|
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
|
---
|
|
libtiff/tif_read.c | 27 ++++++++++++++++++---------
|
|
1 file changed, 24 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c
|
|
index 52bbf507..b7aacbda 100644
|
|
--- a/libtiff/tif_read.c
|
|
+++ b/libtiff/tif_read.c
|
|
@@ -420,16 +420,25 @@ TIFFReadRawStrip1(TIFF* tif, uint32 strip, void* buf, tmsize_t size,
|
|
return ((tmsize_t)(-1));
|
|
}
|
|
} else {
|
|
- tmsize_t ma,mb;
|
|
+ tmsize_t ma;
|
|
tmsize_t n;
|
|
- ma=(tmsize_t)td->td_stripoffset[strip];
|
|
- mb=ma+size;
|
|
- if ((td->td_stripoffset[strip] > (uint64)TIFF_TMSIZE_T_MAX)||(ma>tif->tif_size))
|
|
- n=0;
|
|
- else if ((mb<ma)||(mb<size)||(mb>tif->tif_size))
|
|
- n=tif->tif_size-ma;
|
|
- else
|
|
- n=size;
|
|
+ if ((td->td_stripoffset[strip] > (uint64)TIFF_TMSIZE_T_MAX)||
|
|
+ ((ma=(tmsize_t)td->td_stripoffset[strip])>tif->tif_size))
|
|
+ {
|
|
+ n=0;
|
|
+ }
|
|
+ else if( ma > TIFF_TMSIZE_T_MAX - size )
|
|
+ {
|
|
+ n=0;
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ tmsize_t mb=ma+size;
|
|
+ if (mb>tif->tif_size)
|
|
+ n=tif->tif_size-ma;
|
|
+ else
|
|
+ n=size;
|
|
+ }
|
|
if (n!=size) {
|
|
#if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
|
|
TIFFErrorExt(tif->tif_clientdata, module,
|
|
--
|
|
2.11.0
|
|
|