unzip: CVE-2014-9913 CVE-2016-9844
Backport the patches for CVE-2014-9913 CVE-2016-9844 CVE-2016-9844: Buffer overflow in the zi_short function in zipinfo.c in Info-Zip UnZip 6.0 allows remote attackers to cause a denial of service (crash) via a large compression method value in the central directory file header. CVE-2014-9913: Buffer overflow in the list_files function in list.c in Info-Zip UnZip 6.0 allows remote attackers to cause a denial of service (crash) via vectors related to the compression method. Patches come from: https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/archivers/unzip/ or https://release.debian.org/proposed-updates/stable_diffs/unzip_6.0-16+deb8u3.debdiff Bug-Debian: https://bugs.debian.org/847486 Bug-Ubuntu: https://launchpad.net/bugs/1643750 (LOCAL REV: NOT UPSTREAM) --send to oe-core on 20170222 (From OE-Core rev: fc386ed4afb76bd3e5a3afff54d7dc8dde14fe9c) Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
9e6cb6ec8b
commit
1f9af41dde
|
@ -0,0 +1,33 @@
|
||||||
|
From: "Steven M. Schweda" <sms@antinode.info>
|
||||||
|
Subject: Fix CVE-2014-9913, buffer overflow in unzip
|
||||||
|
Bug: https://sourceforge.net/p/infozip/bugs/27/
|
||||||
|
Bug-Debian: https://bugs.debian.org/847485
|
||||||
|
Bug-Ubuntu: https://launchpad.net/bugs/387350
|
||||||
|
X-Debian-version: 6.0-21
|
||||||
|
|
||||||
|
Upstream-Status: Backport
|
||||||
|
|
||||||
|
Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
|
||||||
|
|
||||||
|
--- a/list.c
|
||||||
|
+++ b/list.c
|
||||||
|
@@ -339,7 +339,18 @@
|
||||||
|
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);
|
||||||
|
+ /* 2013-02-26 SMS.
|
||||||
|
+ * http://sourceforge.net/p/infozip/bugs/27/ CVE-2014-9913.
|
||||||
|
+ * Unexpectedly large compression methods overflow
|
||||||
|
+ * &methbuf[]. Use the old, three-digit decimal format
|
||||||
|
+ * for values which fit. Otherwise, sacrifice the
|
||||||
|
+ * colon, and use four-digit hexadecimal.
|
||||||
|
+ */
|
||||||
|
+ 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? */
|
|
@ -0,0 +1,32 @@
|
||||||
|
From: "Steven M. Schweda" <sms@antinode.info>
|
||||||
|
Subject: Fix CVE-2016-9844, buffer overflow in zipinfo
|
||||||
|
Bug-Debian: https://bugs.debian.org/847486
|
||||||
|
Bug-Ubuntu: https://launchpad.net/bugs/1643750
|
||||||
|
X-Debian-version: 6.0-21
|
||||||
|
|
||||||
|
Upstream-Status: Backport
|
||||||
|
|
||||||
|
Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
|
||||||
|
|
||||||
|
--- a/zipinfo.c
|
||||||
|
+++ b/zipinfo.c
|
||||||
|
@@ -1921,7 +1921,18 @@
|
||||||
|
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)
|
|
@ -16,7 +16,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/
|
||||||
file://11-cve-2014-8141-getzip64data.patch \
|
file://11-cve-2014-8141-getzip64data.patch \
|
||||||
file://CVE-2015-7696.patch \
|
file://CVE-2015-7696.patch \
|
||||||
file://CVE-2015-7697.patch \
|
file://CVE-2015-7697.patch \
|
||||||
file://fix-security-format.patch \
|
file://fix-security-format.patch \
|
||||||
|
file://18-cve-2014-9913-unzip-buffer-overflow.patch \
|
||||||
|
file://19-cve-2016-9844-zipinfo-buffer-overflow.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "62b490407489521db863b523a7f86375"
|
SRC_URI[md5sum] = "62b490407489521db863b523a7f86375"
|
||||||
|
|
Loading…
Reference in New Issue