|
 |
e89a5c |
From 7a05de95bf761c4c2a9e409abd443b0c2c1d0ab7 Mon Sep 17 00:00:00 2001
|
|
|
e89a5c |
From: Even Rouault <even.rouault@spatialys.com>
|
|
|
e89a5c |
Date: Thu, 15 Aug 2019 15:05:28 +0200
|
|
|
e89a5c |
Subject: [PATCH] RGBA interface: fix integer overflow potentially causing
|
|
|
e89a5c |
write heap buffer overflow, especially on 32 bit builds. Fixes
|
|
|
e89a5c |
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=16443. Credit to OSS
|
|
|
e89a5c |
Fuzz
|
|
|
e89a5c |
|
|
|
e89a5c |
---
|
|
|
e89a5c |
libtiff/tif_getimage.c | 26 +++++++++++++++++++++-----
|
|
|
e89a5c |
1 file changed, 21 insertions(+), 5 deletions(-)
|
|
|
e89a5c |
|
|
|
e89a5c |
diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c
|
|
|
e89a5c |
index c664cc0..4c79479 100644
|
|
|
e89a5c |
--- a/libtiff/tif_getimage.c
|
|
|
e89a5c |
+++ b/libtiff/tif_getimage.c
|
|
|
e89a5c |
@@ -889,15 +889,23 @@ gtStripContig(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
|
|
|
e89a5c |
fromskew = (w < imagewidth ? imagewidth - w : 0);
|
|
|
e89a5c |
for (row = 0; row < h; row += nrow)
|
|
|
e89a5c |
{
|
|
|
e89a5c |
+ uint32 temp;
|
|
|
e89a5c |
rowstoread = rowsperstrip - (row + img->row_offset) % rowsperstrip;
|
|
|
e89a5c |
nrow = (row + rowstoread > h ? h - row : rowstoread);
|
|
|
e89a5c |
nrowsub = nrow;
|
|
|
e89a5c |
if ((nrowsub%subsamplingver)!=0)
|
|
|
e89a5c |
nrowsub+=subsamplingver-nrowsub%subsamplingver;
|
|
|
e89a5c |
+ temp = (row + img->row_offset)%rowsperstrip + nrowsub;
|
|
|
e89a5c |
+ if( scanline > 0 && temp > (size_t)(TIFF_TMSIZE_T_MAX / scanline) )
|
|
|
e89a5c |
+ {
|
|
|
e89a5c |
+ TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in gtStripContig");
|
|
|
e89a5c |
+ _TIFFfree(buf);
|
|
|
e89a5c |
+ return 0;
|
|
|
e89a5c |
+ }
|
|
|
e89a5c |
if (TIFFReadEncodedStrip(tif,
|
|
|
e89a5c |
TIFFComputeStrip(tif,row+img->row_offset, 0),
|
|
|
e89a5c |
buf,
|
|
|
e89a5c |
- ((row + img->row_offset)%rowsperstrip + nrowsub) * scanline)==(tmsize_t)(-1)
|
|
|
e89a5c |
+ temp * scanline)==(tmsize_t)(-1)
|
|
|
e89a5c |
&& img->stoponerr)
|
|
|
e89a5c |
{
|
|
|
e89a5c |
ret = 0;
|
|
|
e89a5c |
@@ -997,11 +1005,19 @@ gtStripSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
|
|
|
e89a5c |
fromskew = (w < imagewidth ? imagewidth - w : 0);
|
|
|
e89a5c |
for (row = 0; row < h; row += nrow)
|
|
|
e89a5c |
{
|
|
|
e89a5c |
+ uint32 temp;
|
|
|
e89a5c |
rowstoread = rowsperstrip - (row + img->row_offset) % rowsperstrip;
|
|
|
e89a5c |
nrow = (row + rowstoread > h ? h - row : rowstoread);
|
|
|
e89a5c |
offset_row = row + img->row_offset;
|
|
|
e89a5c |
+ temp = (row + img->row_offset)%rowsperstrip + nrow;
|
|
|
e89a5c |
+ if( scanline > 0 && temp > (size_t)(TIFF_TMSIZE_T_MAX / scanline) )
|
|
|
e89a5c |
+ {
|
|
|
e89a5c |
+ TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in gtStripSeparate");
|
|
|
e89a5c |
+ _TIFFfree(buf);
|
|
|
e89a5c |
+ return 0;
|
|
|
e89a5c |
+ }
|
|
|
e89a5c |
if (TIFFReadEncodedStrip(tif, TIFFComputeStrip(tif, offset_row, 0),
|
|
|
e89a5c |
- p0, ((row + img->row_offset)%rowsperstrip + nrow) * scanline)==(tmsize_t)(-1)
|
|
|
e89a5c |
+ p0, temp * scanline)==(tmsize_t)(-1)
|
|
|
e89a5c |
&& img->stoponerr)
|
|
|
e89a5c |
{
|
|
|
e89a5c |
ret = 0;
|
|
|
e89a5c |
@@ -1009,7 +1025,7 @@ gtStripSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
|
|
|
e89a5c |
}
|
|
|
e89a5c |
if (colorchannels > 1
|
|
|
e89a5c |
&& TIFFReadEncodedStrip(tif, TIFFComputeStrip(tif, offset_row, 1),
|
|
|
e89a5c |
- p1, ((row + img->row_offset)%rowsperstrip + nrow) * scanline) == (tmsize_t)(-1)
|
|
|
e89a5c |
+ p1, temp * scanline) == (tmsize_t)(-1)
|
|
|
e89a5c |
&& img->stoponerr)
|
|
|
e89a5c |
{
|
|
|
e89a5c |
ret = 0;
|
|
|
e89a5c |
@@ -1017,7 +1033,7 @@ gtStripSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
|
|
|
e89a5c |
}
|
|
|
e89a5c |
if (colorchannels > 1
|
|
|
e89a5c |
&& TIFFReadEncodedStrip(tif, TIFFComputeStrip(tif, offset_row, 2),
|
|
|
e89a5c |
- p2, ((row + img->row_offset)%rowsperstrip + nrow) * scanline) == (tmsize_t)(-1)
|
|
|
e89a5c |
+ p2, temp * scanline) == (tmsize_t)(-1)
|
|
|
e89a5c |
&& img->stoponerr)
|
|
|
e89a5c |
{
|
|
|
e89a5c |
ret = 0;
|
|
|
e89a5c |
@@ -1026,7 +1042,7 @@ gtStripSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
|
|
|
e89a5c |
if (alpha)
|
|
|
e89a5c |
{
|
|
|
e89a5c |
if (TIFFReadEncodedStrip(tif, TIFFComputeStrip(tif, offset_row, colorchannels),
|
|
|
e89a5c |
- pa, ((row + img->row_offset)%rowsperstrip + nrow) * scanline)==(tmsize_t)(-1)
|
|
|
e89a5c |
+ pa, temp * scanline)==(tmsize_t)(-1)
|
|
|
e89a5c |
&& img->stoponerr)
|
|
|
e89a5c |
{
|
|
|
e89a5c |
ret = 0;
|
|
|
e89a5c |
--
|
|
|
e89a5c |
2.26.0.rc2
|
|
|
e89a5c |
|