diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-01-06 12:57:15 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-01-06 12:57:15 -0500 |
| commit | 23800e47361304682914314b99cfd4f3926f28e3 (patch) | |
| tree | e67d984ab5961a81c8b8c6396c79cb218fecda85 /gnu/packages/patches/unzip-CVE-2014-8139.patch | |
| parent | 9b1bf33081652210502c6ef34506e27a9bc60f06 (diff) | |
| parent | aebb05b09502be00fb121f9c6cd74a190fb12a1c (diff) | |
| download | guix-patches-23800e47361304682914314b99cfd4f3926f28e3.tar guix-patches-23800e47361304682914314b99cfd4f3926f28e3.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/unzip-CVE-2014-8139.patch')
| -rw-r--r-- | gnu/packages/patches/unzip-CVE-2014-8139.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/gnu/packages/patches/unzip-CVE-2014-8139.patch b/gnu/packages/patches/unzip-CVE-2014-8139.patch new file mode 100644 index 0000000000..433efd1aaf --- /dev/null +++ b/gnu/packages/patches/unzip-CVE-2014-8139.patch @@ -0,0 +1,49 @@ +From: sms +Subject: Fix CVE-2014-8139: CRC32 verification heap-based overflow +Bug-Debian: http://bugs.debian.org/773722 + +--- a/extract.c ++++ b/extract.c +@@ -1,5 +1,5 @@ + /* +- Copyright (c) 1990-2009 Info-ZIP. All rights reserved. ++ Copyright (c) 1990-2014 Info-ZIP. All rights reserved. + + See the accompanying file LICENSE, version 2009-Jan-02 or later + (the contents of which are also included in unzip.h) for terms of use. +@@ -298,6 +298,8 @@ + #ifndef SFX + static ZCONST char Far InconsistEFlength[] = "bad extra-field entry:\n \ + EF block length (%u bytes) exceeds remaining EF data (%u bytes)\n"; ++ static ZCONST char Far TooSmallEFlength[] = "bad extra-field entry:\n \ ++ EF block length (%u bytes) invalid (< %d)\n"; + static ZCONST char Far InvalidComprDataEAs[] = + " invalid compressed data for EAs\n"; + # if (defined(WIN32) && defined(NTSD_EAS)) +@@ -2023,7 +2025,8 @@ + ebID = makeword(ef); + ebLen = (unsigned)makeword(ef+EB_LEN); + +- if (ebLen > (ef_len - EB_HEADSIZE)) { ++ if (ebLen > (ef_len - EB_HEADSIZE)) ++ { + /* Discovered some extra field inconsistency! */ + if (uO.qflag) + Info(slide, 1, ((char *)slide, "%-22s ", +@@ -2032,6 +2035,16 @@ + ebLen, (ef_len - EB_HEADSIZE))); + return PK_ERR; + } ++ else if (ebLen < EB_HEADSIZE) ++ { ++ /* Extra block length smaller than header length. */ ++ if (uO.qflag) ++ Info(slide, 1, ((char *)slide, "%-22s ", ++ FnFilter1(G.filename))); ++ Info(slide, 1, ((char *)slide, LoadFarString(TooSmallEFlength), ++ ebLen, EB_HEADSIZE)); ++ return PK_ERR; ++ } + + switch (ebID) { + case EF_OS2: |