From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by mail.openembedded.org (Postfix) with ESMTP id A068675E80 for ; Sun, 10 Jan 2016 00:31:06 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id 65so2202322pff.2 for ; Sat, 09 Jan 2016 16:31:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references:in-reply-to :references; bh=w7oAHruvYQb++a6ctGO4J//A7dXP/PcyCWqFtvsRWME=; b=f7YlgIdUHfX00r2c8E+54VPpnFDjcz4MQtMjJNiVUaaIYyLN5P1iWYxp7GILRQLpY4 D+ZgevffkAQcwkCgEoLaXvjy2ESGeKqNdl0C4kiFXZobNfZGdwUsen3PVMvkpVh71LLY SLdhXeOikv+HWY4LJoOy55sERUHkMEX2oe0jmEpJfiTyMPeKgRlGmuBlOZ9QPkdQb/UJ JJW2kaCmzarK5vNKqSx7GlDUg4AU5VnNMwj8SsEoA3Zp3SBD74CJ0FIDdrBeL+3MvdUm Z/bnoAJL97j76icmnier29zxLNqHcyvW8v6dJC6nBLyB1prYAV59IMFKVKevEHOhxaVT iZ8A== X-Received: by 10.98.10.198 with SMTP id 67mr15618752pfk.75.1452385867583; Sat, 09 Jan 2016 16:31:07 -0800 (PST) Received: from bigIsland.kama-aina.net (c-76-20-92-207.hsd1.ca.comcast.net. [76.20.92.207]) by smtp.gmail.com with ESMTPSA id 69sm13692298pfn.43.2016.01.09.16.31.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 Jan 2016 16:31:01 -0800 (PST) Received: by bigIsland.kama-aina.net (Postfix, from userid 1000) id A7D96FCC841; Sat, 9 Jan 2016 16:30:50 -0800 (PST) From: Armin Kuster To: openembedded-core@lists.openembedded.org Date: Sat, 9 Jan 2016 16:30:40 -0800 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: Subject: [PATCH 14/20] unzip: CVE-2015-7696, CVE-2015-7697 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jan 2016 00:31:06 -0000 From: Tudor Florea CVE-2015-7696: Fixes a heap overflow triggered by unzipping a file with password CVE-2015-7697: Fixes a denial of service with a file that never finishes unzipping References: http://www.openwall.com/lists/oss-security/2015/10/11/5 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-7696 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-7697 Signed-off-by: Tudor Florea Signed-off-by: Sona Sarmadi Signed-off-by: Armin Kuster --- .../unzip/unzip/CVE-2015-7696.patch | 38 ++++++++++++++++++++++ .../unzip/unzip/CVE-2015-7697.patch | 31 ++++++++++++++++++ meta/recipes-extended/unzip/unzip_6.0.bb | 2 ++ 3 files changed, 71 insertions(+) create mode 100644 meta/recipes-extended/unzip/unzip/CVE-2015-7696.patch create mode 100644 meta/recipes-extended/unzip/unzip/CVE-2015-7697.patch diff --git a/meta/recipes-extended/unzip/unzip/CVE-2015-7696.patch b/meta/recipes-extended/unzip/unzip/CVE-2015-7696.patch new file mode 100644 index 0000000..ea93823 --- /dev/null +++ b/meta/recipes-extended/unzip/unzip/CVE-2015-7696.patch @@ -0,0 +1,38 @@ +Upstream-Status: Backport +Signed-off-by: Tudor Florea + +From 68efed87fabddd450c08f3112f62a73f61d493c9 Mon Sep 17 00:00:00 2001 +From: Petr Stodulka +Date: Mon, 14 Sep 2015 18:23:17 +0200 +Subject: [PATCH 1/2] upstream fix for heap overflow + +https://bugzilla.redhat.com/attachment.cgi?id=1073002 +--- + crypt.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/crypt.c b/crypt.c +index 784e411..a8975f2 100644 +--- a/crypt.c ++++ b/crypt.c +@@ -465,7 +465,17 @@ int decrypt(__G__ passwrd) + GLOBAL(pInfo->encrypted) = FALSE; + defer_leftover_input(__G); + for (n = 0; n < RAND_HEAD_LEN; n++) { +- b = NEXTBYTE; ++ /* 2012-11-23 SMS. (OUSPG report.) ++ * Quit early if compressed size < HEAD_LEN. The resulting ++ * error message ("unable to get password") could be improved, ++ * but it's better than trying to read nonexistent data, and ++ * then continuing with a negative G.csize. (See ++ * fileio.c:readbyte()). ++ */ ++ if ((b = NEXTBYTE) == (ush)EOF) ++ { ++ return PK_ERR; ++ } + h[n] = (uch)b; + Trace((stdout, " (%02x)", h[n])); + } +-- +2.4.6 diff --git a/meta/recipes-extended/unzip/unzip/CVE-2015-7697.patch b/meta/recipes-extended/unzip/unzip/CVE-2015-7697.patch new file mode 100644 index 0000000..da68988 --- /dev/null +++ b/meta/recipes-extended/unzip/unzip/CVE-2015-7697.patch @@ -0,0 +1,31 @@ +Upstream-Status: Backport +Signed-off-by: Tudor Florea + +From bd8a743ee0a77e65ad07ef4196c4cd366add3f26 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Mon, 14 Sep 2015 18:24:56 +0200 +Subject: [PATCH 2/2] fix infinite loop when extracting empty bzip2 data + +--- + extract.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/extract.c b/extract.c +index 7134bfe..29db027 100644 +--- a/extract.c ++++ b/extract.c +@@ -2733,6 +2733,12 @@ __GDEF + int repeated_buf_err; + bz_stream bstrm; + ++ if (G.incnt <= 0 && G.csize <= 0L) { ++ /* avoid an infinite loop */ ++ Trace((stderr, "UZbunzip2() got empty input\n")); ++ return 2; ++ } ++ + #if (defined(DLL) && !defined(NO_SLIDE_REDIR)) + if (G.redirect_slide) + wsize = G.redirect_size, redirSlide = G.redirect_buffer; +-- +2.4.6 diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_6.0.bb index e590f81..acbc837 100644 --- a/meta/recipes-extended/unzip/unzip_6.0.bb +++ b/meta/recipes-extended/unzip/unzip_6.0.bb @@ -14,6 +14,8 @@ SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/unzip60.tgz \ file://09-cve-2014-8139-crc-overflow.patch \ file://10-cve-2014-8140-test-compr-eb.patch \ file://11-cve-2014-8141-getzip64data.patch \ + file://CVE-2015-7696.patch \ + file://CVE-2015-7697.patch \ " SRC_URI[md5sum] = "62b490407489521db863b523a7f86375" -- 1.9.1