libs/tiff/patches/100-CVE.patch

   1 commit 8c101323f5789ef6a0db952d53794e9c4ba48207
   2 Author: erouault <erouault>
   3 Date:   Fri Dec 2 21:56:56 2016 +0000
   4
   5     * libtiff/tif_read.c, libtiff/tiffiop.h: fix uint32 overflow in
   6     TIFFReadEncodedStrip() that caused an integer division by zero.
   7     Reported by Agostino Sarubbo.
   8     Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2596
   9
  10 diff --git a/ChangeLog b/ChangeLog
  11 index 46a5d7c..668b66a 100644
  12 --- a/ChangeLog
  13 +++ b/ChangeLog
  14 @@ -1,3 +1,10 @@
  15 +2016-12-02 Even Rouault <even.rouault at spatialys.com>
  16 +
  17 +       * libtiff/tif_read.c, libtiff/tiffiop.h: fix uint32 overflow in
  18 +       TIFFReadEncodedStrip() that caused an integer division by zero.
  19 +       Reported by Agostino Sarubbo.
  20 +       Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2596
  21 +
  22  2016-11-19  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
  23
  24         * libtiff 4.0.7 released.
  25 diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c
  26 index 8003592..29a311d 100644
  27 --- a/libtiff/tif_read.c
  28 +++ b/libtiff/tif_read.c
  29 @@ -1,4 +1,4 @@
  30 -/* $Id: tif_read.c,v 1.49 2016-07-10 18:00:21 erouault Exp $ */
  31 +/* $Id: tif_read.c,v 1.50 2016-12-02 21:56:56 erouault Exp $ */
  32
  33  /*
  34   * Copyright (c) 1988-1997 Sam Leffler
  35 @@ -346,7 +346,7 @@ TIFFReadEncodedStrip(TIFF* tif, uint32 strip, void* buf, tmsize_t size)
  36         rowsperstrip=td->td_rowsperstrip;
  37         if (rowsperstrip>td->td_imagelength)
  38                 rowsperstrip=td->td_imagelength;
  39 -       stripsperplane=((td->td_imagelength+rowsperstrip-1)/rowsperstrip);
  40 +       stripsperplane= TIFFhowmany_32_maxuint_compat(td->td_imagelength, rowsperstrip);
  41         stripinplane=(strip%stripsperplane);
  42         plane=(uint16)(strip/stripsperplane);
  43         rows=td->td_imagelength-stripinplane*rowsperstrip;
  44 diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h
  45 index 8bcd0c1..5294ee7 100644
  46 --- a/libtiff/tiffiop.h
  47 +++ b/libtiff/tiffiop.h
  48 @@ -1,4 +1,4 @@
  49 -/* $Id: tiffiop.h,v 1.89 2016-01-23 21:20:34 erouault Exp $ */
  50 +/* $Id: tiffiop.h,v 1.90 2016-12-02 21:56:56 erouault Exp $ */
  51
  52  /*
  53   * Copyright (c) 1988-1997 Sam Leffler
  54 @@ -250,6 +250,10 @@ struct tiff {
  55  #define TIFFhowmany_32(x, y) (((uint32)x < (0xffffffff - (uint32)(y-1))) ? \
  56                            ((((uint32)(x))+(((uint32)(y))-1))/((uint32)(y))) : \
  57                            0U)
  58 +/* Variant of TIFFhowmany_32() that doesn't return 0 if x close to MAXUINT. */
  59 +/* Caution: TIFFhowmany_32_maxuint_compat(x,y)*y might overflow */
  60 +#define TIFFhowmany_32_maxuint_compat(x, y) \
  61 +                          (((uint32)(x) / (uint32)(y)) + ((((uint32)(x) % (uint32)(y)) != 0) ? 1 : 0))
  62  #define TIFFhowmany8_32(x) (((x)&0x07)?((uint32)(x)>>3)+1:(uint32)(x)>>3)
  63  #define TIFFroundup_32(x, y) (TIFFhowmany_32(x,y)*(y))
  64  #define TIFFhowmany_64(x, y) ((((uint64)(x))+(((uint64)(y))-1))/((uint64)(y)))