components/unzip/patches/CVE-2014-8139.patch
author Jiri Sasek <Jiri.Sasek@Oracle.COM>
Tue, 20 Jan 2015 05:18:57 -0800
branchs11-update
changeset 3678 96c88473320c
permissions -rw-r--r--
20298643 problem in UTILITY/ZIP
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3678
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     1
Source:
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     2
https://bugzilla.redhat.com/show_bug.cgi?id=1174844
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     3
Info:
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     4
http://www.ocert.org/advisories/ocert-2014-011.html
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     5
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     6
--- unzip60/extract.c	2010-04-03 14:41:55 -0500
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     7
+++ unzip60/extract.c	2014-12-03 15:33:35 -0600
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     8
@@ -1,5 +1,5 @@
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     9
 /*
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    10
-  Copyright (c) 1990-2009 Info-ZIP.  All rights reserved.
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    11
+  Copyright (c) 1990-2014 Info-ZIP.  All rights reserved.
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    12
 
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    13
   See the accompanying file LICENSE, version 2009-Jan-02 or later
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    14
   (the contents of which are also included in unzip.h) for terms of use.
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    15
@@ -298,6 +298,8 @@
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    16
 #ifndef SFX
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    17
    static ZCONST char Far InconsistEFlength[] = "bad extra-field entry:\n \
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    18
      EF block length (%u bytes) exceeds remaining EF data (%u bytes)\n";
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    19
+   static ZCONST char Far TooSmallEFlength[] = "bad extra-field entry:\n \
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    20
+     EF block length (%u bytes) invalid (< %d)\n";
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    21
    static ZCONST char Far InvalidComprDataEAs[] =
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    22
      " invalid compressed data for EAs\n";
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    23
 #  if (defined(WIN32) && defined(NTSD_EAS))
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    24
@@ -2023,7 +2025,8 @@
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    25
         ebID = makeword(ef);
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    26
         ebLen = (unsigned)makeword(ef+EB_LEN);
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    27
 
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    28
-        if (ebLen > (ef_len - EB_HEADSIZE)) {
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    29
+        if (ebLen > (ef_len - EB_HEADSIZE))
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    30
+        {
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    31
            /* Discovered some extra field inconsistency! */
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    32
             if (uO.qflag)
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    33
                 Info(slide, 1, ((char *)slide, "%-22s ",
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    34
@@ -2032,6 +2035,16 @@
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    35
               ebLen, (ef_len - EB_HEADSIZE)));
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    36
             return PK_ERR;
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    37
         }
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    38
+        else if (ebLen < EB_HEADSIZE)
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    39
+        {
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    40
+            /* Extra block length smaller than header length. */
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    41
+            if (uO.qflag)
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    42
+                Info(slide, 1, ((char *)slide, "%-22s ",
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    43
+                  FnFilter1(G.filename)));
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    44
+            Info(slide, 1, ((char *)slide, LoadFarString(TooSmallEFlength),
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    45
+              ebLen, EB_HEADSIZE));
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    46
+            return PK_ERR;
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    47
+        }
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    48
 
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    49
         switch (ebID) {
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    50
             case EF_OS2:
96c88473320c 20298643 problem in UTILITY/ZIP
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    51