diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-07-15 22:55:26 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-07-15 23:02:27 -0400 |
| commit | 385ae063c9826baf00ae47d7689f23af52bce753 (patch) | |
| tree | a8f142d508c8f7188387a5b6fbcf9afa664468f4 /gnu/packages/patches/unzip-CVE-2014-9636.patch | |
| parent | 368474150b0a77ff54509f6ad0533d8c5a208bac (diff) | |
| download | guix-patches-385ae063c9826baf00ae47d7689f23af52bce753.tar guix-patches-385ae063c9826baf00ae47d7689f23af52bce753.tar.gz | |
gnu: unzip: Fix CVE-2014-9636 and some other bugs.
* gnu/packages/patches/unzip-CVE-2014-9636.patch,
gnu/packages/patches/unzip-allow-greater-hostver-values.patch,
gnu/packages/patches/unzip-increase-size-of-cfactorstr.patch,
gnu/packages/patches/unzip-initialize-symlink-flag.patch,
gnu/packages/patches/unzip-remove-build-date.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/zip.scm (unzip)[source]: Add patches.
[arguments]: Use 'modify-phases'. Remove custom 'configure' phase; pass
additional make-flags instead. Add custom 'build' phase that builds
"generic_gcc" target; remove "generic_gcc" from make-flags.
Diffstat (limited to 'gnu/packages/patches/unzip-CVE-2014-9636.patch')
| -rw-r--r-- | gnu/packages/patches/unzip-CVE-2014-9636.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/gnu/packages/patches/unzip-CVE-2014-9636.patch b/gnu/packages/patches/unzip-CVE-2014-9636.patch new file mode 100644 index 0000000000..a38c3da51c --- /dev/null +++ b/gnu/packages/patches/unzip-CVE-2014-9636.patch @@ -0,0 +1,41 @@ +Copied from Debian. + +From: mancha <mancha1 AT zoho DOT com> +Date: Mon, 3 Nov 2014 +Subject: Info-ZIP UnZip buffer overflow +Bug-Debian: http://bugs.debian.org/776589 + +By carefully crafting a corrupt ZIP archive with "extra fields" that +purport to have compressed blocks larger than the corresponding +uncompressed blocks in STORED no-compression mode, an attacker can +trigger a heap overflow that can result in application crash or +possibly have other unspecified impact. + +This patch ensures that when extra fields use STORED mode, the +"compressed" and uncompressed block sizes match. + +--- a/extract.c ++++ b/extract.c +@@ -2228,6 +2228,7 @@ + ulg eb_ucsize; + uch *eb_ucptr; + int r; ++ ush eb_compr_method; + + if (compr_offset < 4) /* field is not compressed: */ + return PK_OK; /* do nothing and signal OK */ +@@ -2244,6 +2245,14 @@ + ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN)))) + return IZ_EF_TRUNC; /* no/bad compressed data! */ + ++ /* 2014-11-03 Michal Zalewski, SMS. ++ * For STORE method, compressed and uncompressed sizes must agree. ++ * http://www.info-zip.org/phpBB3/viewtopic.php?f=7&t=450 ++ */ ++ eb_compr_method = makeword( eb + (EB_HEADSIZE + compr_offset)); ++ if ((eb_compr_method == STORED) && (eb_size - compr_offset != eb_ucsize)) ++ return PK_ERR; ++ + if ( + #ifdef INT_16BIT + (((ulg)(extent)eb_ucsize) != eb_ucsize) || |