summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2016-11-10 18:23:57 -0500
committerLeo Famulari <leo@famulari.name>2016-11-12 11:05:19 -0500
commit5c66314bd98e4eb27f88a750cdd2812c62671fc6 (patch)
tree4f9834a096f0e7dd93d8f8497d9b3dfe3c4c6ef0
parent0a7f17f0e02bb5434fc9b23b6a46897c0ea34782 (diff)
gnu: libtiff: Fix CVE-2016-9273.
* gnu/packages/patches/libtiff-CVE-2016-9273.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/image.scm (libtiff/fixed): Use it.
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/image.scm3
-rw-r--r--gnu/packages/patches/libtiff-CVE-2016-9273.patch41
3 files changed, 44 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index b8c597ea69..d28b9609a7 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -664,6 +664,7 @@ dist_patch_DATA = \
%D%/packages/patches/libtiff-CVE-2016-5321.patch \
%D%/packages/patches/libtiff-CVE-2016-5323.patch \
%D%/packages/patches/libtiff-CVE-2016-5652.patch \
+ %D%/packages/patches/libtiff-CVE-2016-9273.patch \
%D%/packages/patches/libtiff-oob-accesses-in-decode.patch \
%D%/packages/patches/libtiff-oob-write-in-nextdecode.patch \
%D%/packages/patches/libtool-skip-tests2.patch \
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 601e81805b..be570e7045 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -292,7 +292,8 @@ collection of tools for doing simple manipulations of TIFF images.")
"libtiff-CVE-2016-5314.patch"
"libtiff-CVE-2016-5321.patch"
"libtiff-CVE-2016-5323.patch"
- "libtiff-CVE-2016-5652.patch"))))))
+ "libtiff-CVE-2016-5652.patch"
+ "libtiff-CVE-2016-9273.patch"))))))
(define-public libwmf
(package
diff --git a/gnu/packages/patches/libtiff-CVE-2016-9273.patch b/gnu/packages/patches/libtiff-CVE-2016-9273.patch
new file mode 100644
index 0000000000..9cd6b3d8c5
--- /dev/null
+++ b/gnu/packages/patches/libtiff-CVE-2016-9273.patch
@@ -0,0 +1,41 @@
+Fix CVE-2016-9273:
+
+https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-9273
+http://bugzilla.maptools.org/show_bug.cgi?id=2587
+
+Patch extracted from upstream CVS repo:
+
+2016-11-10 Even Rouault <even.rouault at spatialys.com>
+
+revision 1.37
+date: 2016-11-09 18:00:49 -0500; author: erouault; state: Exp; lines: +10 -1; commitid: pzKipPxDJO2dxvtz;
+* libtiff/tif_strip.c: make TIFFNumberOfStrips() return the td->td_nstrips
+value when it is non-zero, instead of recomputing it. This is needed in
+TIFF_STRIPCHOP mode where td_nstrips is modified. Fixes a read outsize of
+array in tiffsplit (or other utilities using TIFFNumberOfStrips()).
+Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2587
+
+Index: libtiff/tif_strip.c
+===================================================================
+RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tif_strip.c,v
+retrieving revision 1.36
+retrieving revision 1.37
+diff -u -r1.36 -r1.37
+--- a/libtiff/tif_strip.c 7 Jun 2015 22:35:40 -0000 1.36
++++ b/libtiff/tif_strip.c 9 Nov 2016 23:00:49 -0000 1.37
+@@ -63,6 +63,15 @@
+ TIFFDirectory *td = &tif->tif_dir;
+ uint32 nstrips;
+
++ /* If the value was already computed and store in td_nstrips, then return it,
++ since ChopUpSingleUncompressedStrip might have altered and resized the
++ since the td_stripbytecount and td_stripoffset arrays to the new value
++ after the initial affectation of td_nstrips = TIFFNumberOfStrips() in
++ tif_dirread.c ~line 3612.
++ See http://bugzilla.maptools.org/show_bug.cgi?id=2587 */
++ if( td->td_nstrips )
++ return td->td_nstrips;
++
+ nstrips = (td->td_rowsperstrip == (uint32) -1 ? 1 :
+ TIFFhowmany_32(td->td_imagelength, td->td_rowsperstrip));
+ if (td->td_planarconfig == PLANARCONFIG_SEPARATE)