patches/unzip/0001-Fix-CVE-2016-9844-rhbz-1404283.patch

   1 From 754137e70cf58a64ad524b704a86b651ba0cde07 Mon Sep 17 00:00:00 2001
   2 From: Petr Stodulka <pstodulk@redhat.com>
   3 Date: Wed, 14 Dec 2016 16:30:36 +0100
   4 Subject: [PATCH] Fix CVE-2016-9844 (rhbz#1404283)
   5
   6 Fixes buffer overflow in zipinfo in similar way like fix for
   7 CVE-2014-9913 provided by upstream.
   8 ---
   9  zipinfo.c | 14 +++++++++++++-
  10  1 file changed, 13 insertions(+), 1 deletion(-)
  11
  12 diff --git a/zipinfo.c b/zipinfo.c
  13 index c03620e..accca2a 100644
  14 --- a/zipinfo.c
  15 +++ b/zipinfo.c
  16 @@ -1984,7 +1984,19 @@ static int zi_short(__G)   /* return PK-type error code */
  17          ush  dnum=(ush)((G.crec.general_purpose_bit_flag>>1) & 3);
  18          methbuf[3] = dtype[dnum];
  19      } else if (methnum >= NUM_METHODS) {   /* unknown */
  20 -        sprintf(&methbuf[1], "%03u", G.crec.compression_method);
  21 +        /* 2016-12-05 SMS.
  22 +         * https://launchpad.net/bugs/1643750
  23 +         * Unexpectedly large compression methods overflow
  24 +         * &methbuf[].  Use the old, three-digit decimal format
  25 +         * for values which fit.  Otherwise, sacrifice the "u",
  26 +         * and use four-digit hexadecimal.
  27 +         */
  28 +        if (G.crec.compression_method <= 999) {
  29 +              sprintf( &methbuf[ 1], "%03u", G.crec.compression_method);
  30 +        } else {
  31 +              sprintf( &methbuf[ 0], "%04X", G.crec.compression_method);
  32 +        }
  33 +
  34      }
  35
  36      for (k = 0;  k < 15;  ++k)
  37 --
  38 2.5.5
  39