aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2016-11-15 15:26:53 -0500
committerLeo Famulari <leo@famulari.name>2016-11-16 19:59:28 -0500
commit1339a8ed1cfe2e6087b26e44a8a593d7f1a3f892 (patch)
tree9f8c8898354396ac6082237dc0368aa4f580a4db
parent7cea56e2ac3b0a5030cbd10783865b6985c01b22 (diff)
downloadguix-1339a8ed1cfe2e6087b26e44a8a593d7f1a3f892.tar
guix-1339a8ed1cfe2e6087b26e44a8a593d7f1a3f892.tar.gz
gnu: libtiff: Fix some buffer overflows.
* gnu/packages/patches/libtiff-uint32-overflow.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/image.scm (libtiff/fixed)[source]: Use it.
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/image.scm1
-rw-r--r--gnu/packages/patches/libtiff-uint32-overflow.patch102
3 files changed, 104 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 2087b8c701..a5b75c1891 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -671,6 +671,7 @@ dist_patch_DATA = \
%D%/packages/patches/libtiff-CVE-2016-9297.patch \
%D%/packages/patches/libtiff-oob-accesses-in-decode.patch \
%D%/packages/patches/libtiff-oob-write-in-nextdecode.patch \
+ %D%/packages/patches/libtiff-uint32-overflow.patch \
%D%/packages/patches/libtool-skip-tests2.patch \
%D%/packages/patches/libunwind-CVE-2015-3239.patch \
%D%/packages/patches/libupnp-CVE-2016-6255.patch \
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 1f3a775c16..8f08fad153 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -291,6 +291,7 @@ collection of tools for doing simple manipulations of TIFF images.")
(patches (search-patches
"libtiff-oob-accesses-in-decode.patch"
"libtiff-oob-write-in-nextdecode.patch"
+ "libtiff-uint32-overflow.patch"
"libtiff-CVE-2015-8665+CVE-2015-8683.patch"
"libtiff-CVE-2016-3623.patch"
"libtiff-CVE-2016-3945.patch"
diff --git a/gnu/packages/patches/libtiff-uint32-overflow.patch b/gnu/packages/patches/libtiff-uint32-overflow.patch
new file mode 100644
index 0000000000..b9b1bc27a4
--- /dev/null
+++ b/gnu/packages/patches/libtiff-uint32-overflow.patch
@@ -0,0 +1,102 @@
+Fix some buffer overflows:
+
+http://seclists.org/oss-sec/2016/q4/
+http://bugzilla.maptools.org/show_bug.cgi?id=2592
+
+2016-11-11 Even Rouault <even.rouault at spatialys.com>
+
+ * tools/tiffcrop.c: fix multiple uint32 overflows in
+ writeBufferToSeparateStrips(), writeBufferToContigTiles() and
+ writeBufferToSeparateTiles() that could cause heap buffer
+overflows.
+ Reported by Henri Salo from Nixu Corporation.
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2592
+
+
+/cvs/maptools/cvsroot/libtiff/ChangeLog,v <-- ChangeLog
+new revision: 1.1152; previous revision: 1.1151
+/cvs/maptools/cvsroot/libtiff/tools/tiffcrop.c,v <-- tools/tiffcrop.c
+new revision: 1.43; previous revision: 1.42
+
+===================================================================
+RCS file: /cvs/maptools/cvsroot/libtiff/tools/tiffcrop.c,v
+retrieving revision 1.42
+retrieving revision 1.43
+diff -u -r1.42 -r1.43
+--- libtiff/tools/tiffcrop.c 14 Oct 2016 19:13:20 -0000 1.42
++++ libtiff/tools/tiffcrop.c 11 Nov 2016 19:33:06 -0000 1.43
+@@ -148,6 +148,8 @@
+ #define PATH_MAX 1024
+ #endif
+
++#define TIFF_UINT32_MAX 0xFFFFFFFFU
++
+ #ifndef streq
+ #define streq(a,b) (strcmp((a),(b)) == 0)
+ #endif
+@@ -1164,7 +1166,24 @@
+ (void) TIFFGetFieldDefaulted(out, TIFFTAG_ROWSPERSTRIP, &rowsperstrip);
+ (void) TIFFGetField(out, TIFFTAG_BITSPERSAMPLE, &bps);
+ bytes_per_sample = (bps + 7) / 8;
+- rowsize = ((bps * spp * width) + 7) / 8; /* source has interleaved samples */
++ if( width == 0 ||
++ (uint32)bps * (uint32)spp > TIFF_UINT32_MAX / width ||
++ bps * spp * width > TIFF_UINT32_MAX - 7U )
++ {
++ TIFFError(TIFFFileName(out),
++ "Error, uint32 overflow when computing (bps * spp * width) + 7");
++ return 1;
++ }
++ rowsize = ((bps * spp * width) + 7U) / 8; /* source has interleaved samples */
++ if( bytes_per_sample == 0 ||
++ rowsperstrip > TIFF_UINT32_MAX / bytes_per_sample ||
++ rowsperstrip * bytes_per_sample > TIFF_UINT32_MAX / (width + 1) )
++ {
++ TIFFError(TIFFFileName(out),
++ "Error, uint32 overflow when computing rowsperstrip * "
++ "bytes_per_sample * (width + 1)");
++ return 1;
++ }
+ rowstripsize = rowsperstrip * bytes_per_sample * (width + 1);
+
+ obuf = _TIFFmalloc (rowstripsize);
+@@ -1251,11 +1270,19 @@
+ }
+ }
+
++ if( imagewidth == 0 ||
++ (uint32)bps * (uint32)spp > TIFF_UINT32_MAX / imagewidth ||
++ bps * spp * imagewidth > TIFF_UINT32_MAX - 7U )
++ {
++ TIFFError(TIFFFileName(out),
++ "Error, uint32 overflow when computing (imagewidth * bps * spp) + 7");
++ return 1;
++ }
++ src_rowsize = ((imagewidth * spp * bps) + 7U) / 8;
++
+ tilebuf = _TIFFmalloc(tile_buffsize);
+ if (tilebuf == 0)
+ return 1;
+-
+- src_rowsize = ((imagewidth * spp * bps) + 7) / 8;
+ for (row = 0; row < imagelength; row += tl)
+ {
+ nrow = (row + tl > imagelength) ? imagelength - row : tl;
+@@ -1315,7 +1342,16 @@
+ TIFFGetField(out, TIFFTAG_TILELENGTH, &tl);
+ TIFFGetField(out, TIFFTAG_TILEWIDTH, &tw);
+ TIFFGetField(out, TIFFTAG_BITSPERSAMPLE, &bps);
+- src_rowsize = ((imagewidth * spp * bps) + 7) / 8;
++
++ if( imagewidth == 0 ||
++ (uint32)bps * (uint32)spp > TIFF_UINT32_MAX / imagewidth ||
++ bps * spp * imagewidth > TIFF_UINT32_MAX - 7 )
++ {
++ TIFFError(TIFFFileName(out),
++ "Error, uint32 overflow when computing (imagewidth * bps * spp) + 7");
++ return 1;
++ }
++ src_rowsize = ((imagewidth * spp * bps) + 7U) / 8;
+
+ for (row = 0; row < imagelength; row += tl)
+ {