From: Kei Kebreau <kei@openmailbox.org>
To: Leo Famulari <leo@famulari.name>
Cc: guix-devel@gnu.org
Subject: Re: [PATCH 1/1] gnu: libtiff: Fix some buffer overflows.
Date: Wed, 16 Nov 2016 13:10:56 -0500 [thread overview]
Message-ID: <8760nne1n3.fsf@openmailbox.org> (raw)
In-Reply-To: <cf7e5e0ee1c2226da19b0236d50ebb4879fb2a3e.1479241675.git.leo@famulari.name> (Leo Famulari's message of "Tue, 15 Nov 2016 15:28:01 -0500")
[-- Attachment #1: Type: text/plain, Size: 6261 bytes --]
Leo Famulari <leo@famulari.name> writes:
> * 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.
> ---
> gnu/local.mk | 1 +
> gnu/packages/image.scm | 1 +
> gnu/packages/patches/libtiff-uint32-overflow.patch | 102 +++++++++++++++++++++
> 3 files changed, 104 insertions(+)
> create mode 100644 gnu/packages/patches/libtiff-uint32-overflow.patch
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 513bd34..1c27767 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -670,6 +670,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 d38344a..7458f4e 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 0000000..b9b1bc2
> --- /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)
> + {
The Guix linter tells me that ftp.remotesensing.org is not reachable. Is
it reachable for you? My connection could just be bad, or the server
temporarily down.
Otherwise, LGTM.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 800 bytes --]
next prev parent reply other threads:[~2016-11-16 18:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-15 20:28 [PATCH 1/1] gnu: libtiff: Fix some buffer overflows Leo Famulari
2016-11-16 18:10 ` Kei Kebreau [this message]
2016-11-16 19:13 ` Leo Famulari
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8760nne1n3.fsf@openmailbox.org \
--to=kei@openmailbox.org \
--cc=guix-devel@gnu.org \
--cc=leo@famulari.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).