Commit 31f9ee36 authored by Petter Reinholdtsen's avatar Petter Reinholdtsen

Added Issue-547-Fix-CVE-2015-8932.patch to fix problems with compress bidder.

parent 20af74aa
......@@ -16,6 +16,8 @@ libarchive (3.1.2-11+deb8u2) UNRELEASED; urgency=high
smash the stack.
* CVE-2015-8931: Added Issue-539-Fix-CVE-2015-8931.patch removing
possible integer overflow issue when opening any mtree file.
* CVE-2015-8932: Added Issue-547-Fix-CVE-2015-8932.patch to fix
problems with compress bidder.
* CVE-2015-8934: Added Issue-521-Fix-CVE-2015-8934.patch from
upstream to properly check reading from lzss decompression buffer.
* CVE-2016-4300: Added debian/patches/Issue-718-Fix-CVE-2016-4300.patch
......
Description:
The fix is in commit f0b1dbbc325a2d922015eee402b72edd422cb9ea, while
activating the test code is in part of
618618c8a6be453f79e0bdbdeab6e1dd8bf429b3 and
55ce98e829eda3a4356c2be64a778d8740c2cf6c. This patch include all of
the former and the relevant part of the last two.
commit f0b1dbbc325a2d922015eee402b72edd422cb9ea
Author: Tim Kientzle <kientzle@acm.org>
Date: Sat Aug 8 21:47:43 2015 -0700
Issue 547: problems with compress bidder
The code previously was not very careful about verifying the
compression parameters. This led to cases where it failed to
reject invalid compressed data at the beginning. The invalid
left shift was one symptom of this.
The code is now more careful: It verifies that the compression
parameter byte exists and verifies that the maximum code size
is <= 16 bits.
This also includes some new tests to verify that truncated or
otherwise invalid compressed data is rejected.
commit 618618c8a6be453f79e0bdbdeab6e1dd8bf429b3
Author: Graham Percival <gperciva@tarsnap.com>
Date: Wed Sep 2 19:09:06 2015 -0700
add missing tests to automake
commit 55ce98e829eda3a4356c2be64a778d8740c2cf6c
Author: Tim Kientzle <kientzle@gmail.com>
Date: Thu Nov 19 21:09:08 2015 -0800
Add in two missing test cases.
Index: libarchive/libarchive/archive_read_support_filter_compress.c
===================================================================
--- libarchive.orig/libarchive/archive_read_support_filter_compress.c 2016-06-29 12:30:59.292332397 +0200
+++ libarchive/libarchive/archive_read_support_filter_compress.c 2016-06-29 12:30:59.288332360 +0200
@@ -185,19 +185,22 @@
(void)self; /* UNUSED */
- buffer = __archive_read_filter_ahead(filter, 2, &avail);
+ /* Shortest valid compress file is 3 bytes. */
+ buffer = __archive_read_filter_ahead(filter, 3, &avail);
if (buffer == NULL)
return (0);
bits_checked = 0;
+ /* First two bytes are the magic value */
if (buffer[0] != 0x1F || buffer[1] != 0x9D)
return (0);
- bits_checked += 16;
-
- /*
- * TODO: Verify more.
- */
+ /* Third byte holds compression parameters. */
+ if (buffer[2] & 0x20) /* Reserved bit, must be zero. */
+ return (0);
+ if (buffer[2] & 0x40) /* Reserved bit, must be zero. */
+ return (0);
+ bits_checked += 18;
return (bits_checked);
}
@@ -239,7 +242,13 @@
(void)getbits(self, 8); /* Skip first signature byte. */
(void)getbits(self, 8); /* Skip second signature byte. */
+ /* Get compression parameters. */
code = getbits(self, 8);
+ if ((code & 0x1f) > 16) {
+ archive_set_error(&self->archive->archive, -1,
+ "Invalid compressed data");
+ return (ARCHIVE_FATAL);
+ }
state->maxcode_bits = code & 0x1f;
state->maxcode = (1 << state->maxcode_bits);
state->use_reset_code = code & 0x80;
Index: libarchive/libarchive/test/test_read_filter_compress.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ libarchive/libarchive/test/test_read_filter_compress.c 2016-06-29 12:30:59.288332360 +0200
@@ -0,0 +1,80 @@
+/*-
+ * Copyright (c) 2003-2008 Tim Kientzle
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+
+DEFINE_TEST(test_read_filter_compress_truncated)
+{
+ const char data[] = {0x1f, 0x9d};
+ struct archive *a;
+
+ assert((a = archive_read_new()) != NULL);
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_compress(a));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+ assertEqualIntA(a, ARCHIVE_FATAL,
+ archive_read_open_memory(a, data, sizeof(data)));
+
+ assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+}
+
+
+DEFINE_TEST(test_read_filter_compress_empty2)
+{
+ const char data[] = {0x1f, 0x9d, 0x10};
+ struct archive *a;
+ struct archive_entry *ae;
+
+ assert((a = archive_read_new()) != NULL);
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_compress(a));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_read_open_memory(a, data, sizeof(data)));
+
+ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
+
+ /* Verify that the format detection worked. */
+ assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_COMPRESS);
+ assertEqualString(archive_filter_name(a, 0), "compress (.Z)");
+ assertEqualInt(archive_format(a), ARCHIVE_FORMAT_EMPTY);
+
+ assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+}
+
+
+DEFINE_TEST(test_read_filter_compress_invalid)
+{
+ const char data[] = {0x1f, 0x9d, 0x11};
+ struct archive *a;
+
+ assert((a = archive_read_new()) != NULL);
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_compress(a));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+ assertEqualIntA(a, ARCHIVE_FATAL,
+ archive_read_open_memory(a, data, sizeof(data)));
+
+ assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+}
Index: libarchive/libarchive/test/CMakeLists.txt
===================================================================
--- libarchive.orig/libarchive/test/CMakeLists.txt 2016-06-29 12:30:59.292332397 +0200
+++ libarchive/libarchive/test/CMakeLists.txt 2016-06-29 12:30:59.288332360 +0200
@@ -79,6 +79,7 @@
test_read_disk_entry_from_file.c
test_read_extract.c
test_read_file_nonexistent.c
+ test_read_filter_compress.c
test_read_filter_grzip.c
test_read_filter_lrzip.c
test_read_filter_lzop.c
diff --git a/Makefile.am b/Makefile.am
index 3fa2d22..01bd97f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -364,6 +364,7 @@ libarchive_test_SOURCES= \
libarchive/test/test_read_disk_entry_from_file.c \
libarchive/test/test_read_extract.c \
libarchive/test/test_read_file_nonexistent.c \
+ libarchive/test/test_read_filter_compress.c \
libarchive/test/test_read_filter_grzip.c \
libarchive/test/test_read_filter_lrzip.c \
libarchive/test/test_read_filter_lzop.c \
......@@ -13,6 +13,7 @@ Issue-502+503-CVE-2015-8915.patch
Issue-521-Fix-CVE-2015-8934.patch
Issue-522-Fix-CVE-2015-8930.patch
Issue-539-Fix-CVE-2015-8931.patch
Issue-547-Fix-CVE-2015-8932.patch
Issue-718-Fix-CVE-2016-4300.patch
Issue-719-Fix-CVE-2016-4302.patch
Issue-705-Fix-CVE-2016-4809.patch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment