From 15b437ac3a4ce9cd1883aded291d6ee5e4312799 Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 4 Feb 2017 23:25:59 +0000 Subject: Add patches for CVE-2014-9913 and CVE-2016-9844. Bump PKGREVISION. --- archivers/unzip/Makefile | 4 ++-- archivers/unzip/distinfo | 5 +++-- archivers/unzip/patches/patch-list.c | 25 ++++++++++++++++++++++++- archivers/unzip/patches/patch-zipinfo.c | 27 +++++++++++++++++++++++++++ 4 files changed, 56 insertions(+), 5 deletions(-) create mode 100644 archivers/unzip/patches/patch-zipinfo.c (limited to 'archivers/unzip') diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile index f35fe6f9bb6..8a4e5634703 100644 --- a/archivers/unzip/Makefile +++ b/archivers/unzip/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.94 2016/09/13 14:49:16 jperkin Exp $ +# $NetBSD: Makefile,v 1.95 2017/02/04 23:25:59 wiz Exp $ DISTNAME= unzip60 PKGNAME= unzip-6.0 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= archivers MASTER_SITES= ftp://ftp.info-zip.org/pub/infozip/src/ EXTRACT_SUFX= .tgz diff --git a/archivers/unzip/distinfo b/archivers/unzip/distinfo index 678c7d4a259..05d4e23a431 100644 --- a/archivers/unzip/distinfo +++ b/archivers/unzip/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.29 2015/11/11 12:47:26 wiz Exp $ +$NetBSD: distinfo,v 1.30 2017/02/04 23:25:59 wiz Exp $ SHA1 (unzip60.tgz) = abf7de8a4018a983590ed6f5cbd990d4740f8a22 RMD160 (unzip60.tgz) = 48af66606e9472e45fbb94bc4e285da23d1b89ba @@ -9,6 +9,7 @@ SHA1 (patch-ac) = 27b91401d4d5ecc3842c91dc49c08f42c8646154 SHA1 (patch-crypt.c) = e44e14ba2c8e5651659c6756a5adbe88b4385ca4 SHA1 (patch-extract.c) = 042fe7d233d0b3cb1e978902c901e8239f7a3732 SHA1 (patch-fileio.c) = 910ddb3b847cae92326697a399234b2948555534 -SHA1 (patch-list.c) = 7aa261ecef5e5cc14ad387070560730ff419d635 +SHA1 (patch-list.c) = 56ac008e42570d60d58ca84ea773819640461961 SHA1 (patch-process.c) = d6e6ed05ef7c2977353e848d9e9cba2877577812 SHA1 (patch-unix_unxcfg.h) = b2831f38b2245dacedd4eb2eef12ee1e3cf20613 +SHA1 (patch-zipinfo.c) = 0d93fd9b145e7e707762119ee30ddf8eac9c2f31 diff --git a/archivers/unzip/patches/patch-list.c b/archivers/unzip/patches/patch-list.c index 43396fe0684..7c9732de098 100644 --- a/archivers/unzip/patches/patch-list.c +++ b/archivers/unzip/patches/patch-list.c @@ -1,8 +1,15 @@ -$NetBSD: patch-list.c,v 1.1 2015/01/06 14:12:45 wiz Exp $ +$NetBSD: patch-list.c,v 1.2 2017/02/04 23:25:59 wiz Exp $ +chunk 1: Big-hammer fix for http://seclists.org/oss-sec/2014/q4/497 +chunk 2: +CVE-2014-9913 fix from +https://people.debian.org/~sanvila/unzip/cve-2014-9913/cve-2014-9913-unzip-buffer-overflow.txt +via +http://www.info-zip.org/phpBB3/viewtopic.php?f=7&t=529 + --- list.c.orig 2009-02-08 17:11:34.000000000 +0000 +++ list.c @@ -116,7 +116,7 @@ int list_files(__G) /* return PK-type @@ -14,3 +21,19 @@ http://seclists.org/oss-sec/2014/q4/497 static ZCONST char dtype[]="NXFS"; /* see zi_short() */ static ZCONST char Far method[NUM_METHODS+1][8] = {"Stored", "Shrunk", "Reduce1", "Reduce2", "Reduce3", "Reduce4", +@@ -339,7 +339,14 @@ int list_files(__G) /* return PK-type + G.crec.compression_method == ENHDEFLATED) { + methbuf[5] = dtype[(G.crec.general_purpose_bit_flag>>1) & 3]; + } else if (methnum >= NUM_METHODS) { +- sprintf(&methbuf[4], "%03u", G.crec.compression_method); ++ /* Fix for CVE-2014-9913, similar to CVE-2016-9844. ++ * Use the old decimal format only for values which fit. ++ */ ++ if (G.crec.compression_method <= 999) { ++ sprintf( &methbuf[ 4], "%03u", G.crec.compression_method); ++ } else { ++ sprintf( &methbuf[ 3], "%04X", G.crec.compression_method); ++ } + } + + #if 0 /* GRR/Euro: add this? */ diff --git a/archivers/unzip/patches/patch-zipinfo.c b/archivers/unzip/patches/patch-zipinfo.c new file mode 100644 index 00000000000..0110ba0f99d --- /dev/null +++ b/archivers/unzip/patches/patch-zipinfo.c @@ -0,0 +1,27 @@ +$NetBSD: patch-zipinfo.c,v 1.1 2017/02/04 23:25:59 wiz Exp $ + +Fix crash in zipinfo, CVE-2016-9844. +http://www.openwall.com/lists/oss-security/2016/12/05/19 + +--- zipinfo.c.orig 2009-02-08 17:04:30.000000000 +0000 ++++ zipinfo.c +@@ -1921,7 +1921,18 @@ static int zi_short(__G) /* return PK- + ush dnum=(ush)((G.crec.general_purpose_bit_flag>>1) & 3); + methbuf[3] = dtype[dnum]; + } else if (methnum >= NUM_METHODS) { /* unknown */ +- sprintf(&methbuf[1], "%03u", G.crec.compression_method); ++ /* 2016-12-05 SMS. ++ * https://launchpad.net/bugs/1643750 ++ * Unexpectedly large compression methods overflow ++ * &methbuf[]. Use the old, three-digit decimal format ++ * for values which fit. Otherwise, sacrifice the "u", ++ * and use four-digit hexadecimal. ++ */ ++ if (G.crec.compression_method <= 999) { ++ sprintf( &methbuf[ 1], "%03u", G.crec.compression_method); ++ } else { ++ sprintf( &methbuf[ 0], "%04X", G.crec.compression_method); ++ } + } + + for (k = 0; k < 15; ++k) -- cgit v1.2.3