Issue 406: Segfault on malformed Zip archive

Issue here was reading a size field as a signed number
and then using that as an offset.  Fixed by correctly
masking the size value to an unsigned result.

Includes test based on the archive provided in the issue report.

diff --git a/Makefile.am b/Makefile.am
index 0a3cd3192218ce70ff36e1ef6885c0feb10ba8f6..b3bfd67adf3a3ad7845d157ec8be375719a59c46 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -471,6 +471,7 @@ libarchive_test_SOURCES= \
        libarchive/test/test_read_format_zip_encryption_header.c \
        libarchive/test/test_read_format_zip_filename.c \
        libarchive/test/test_read_format_zip_mac_metadata.c \
+       libarchive/test/test_read_format_zip_malformed.c \
        libarchive/test/test_read_format_zip_nested.c \
        libarchive/test/test_read_format_zip_nofiletype.c \
        libarchive/test/test_read_format_zip_padded.c \
@@ -770,6 +771,7 @@ libarchive_test_EXTRA_DIST=\
        libarchive/test/test_read_format_zip_filename_utf8_ru2.zip.uu \
        libarchive/test/test_read_format_zip_length_at_end.zip.uu \
        libarchive/test/test_read_format_zip_mac_metadata.zip.uu \
+       libarchive/test/test_read_format_zip_malformed1.zip.uu \
        libarchive/test/test_read_format_zip_nested.zip.uu \
        libarchive/test/test_read_format_zip_nofiletype.zip.uu \
        libarchive/test/test_read_format_zip_padded1.zip.uu \

diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c
index e73c174fcae8f6b7c4233584e04c547077944f9d..bac07c171f55762b924c51524faca988aa97a98a 100644 (file)
--- a/libarchive/archive_read_support_format_zip.c
+++ b/libarchive/archive_read_support_format_zip.c
@@ -648,7 +648,7 @@ process_extra(const char *p, size_t extra_length, struct zip_entry* zip_entry)
                        if (datasize >= 1 && p[offset] == 1) {/* version=1 */
                                if (datasize >= 4) {
                                        /* get a uid size. */
-                                       uidsize = p[offset+1];
+                                       uidsize = 0xff & (int)p[offset+1];
                                        if (uidsize == 2)
                                                zip_entry->uid =
                                                    archive_le16dec(
@@ -660,7 +660,7 @@ process_extra(const char *p, size_t extra_length, struct zip_entry* zip_entry)
                                }
                                if (datasize >= (2 + uidsize + 3)) {
                                        /* get a gid size. */
-                                       gidsize = p[offset+2+uidsize];
+                                       gidsize = 0xff & (int)p[offset+2+uidsize];
                                        if (gidsize == 2)
                                                zip_entry->gid =
                                                    archive_le16dec(

diff --git a/libarchive/test/CMakeLists.txt b/libarchive/test/CMakeLists.txt
index 045e3e164d8982118efe93abec7ae25f6d2bd778..366022f3b65e505ef2059ab1945d632d5e2cb56f 100644 (file)
--- a/libarchive/test/CMakeLists.txt
+++ b/libarchive/test/CMakeLists.txt
@@ -161,6 +161,7 @@ IF(ENABLE_TEST)
     test_read_format_zip_encryption_partially.c
     test_read_format_zip_filename.c
     test_read_format_zip_mac_metadata.c
+    test_read_format_zip_malformed.c
     test_read_format_zip_nested.c
     test_read_format_zip_nofiletype.c
     test_read_format_zip_padded.c

diff --git a/libarchive/test/test_read_format_zip_malformed.c b/libarchive/test/test_read_format_zip_malformed.c
new file mode 100644 (file)
index 0000000..2327d91
--- /dev/null
+++ b/libarchive/test/test_read_format_zip_malformed.c
@@ -0,0 +1,61 @@
+/*-
+ * Copyright (c) 2003-2007 Tim Kientzle
+ * Copyright (c) 2011 Michihiro NAKAJIMA
+ * 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"
+__FBSDID("$FreeBSD$");
+
+static void
+test_malformed1(void)
+{
+       const char *refname = "test_read_format_zip_malformed1.zip";
+       struct archive *a;
+       struct archive_entry *ae;
+       char *p;
+       size_t s;
+
+       extract_reference_file(refname);
+
+       /* Verify with seeking reader. */
+       assert((a = archive_read_new()) != NULL);
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, refname, 10240));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a));
+
+       /* Verify with streaming reader. */
+       p = slurpfile(&s, refname);
+       assert((a = archive_read_new()) != NULL);
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+       assertEqualIntA(a, ARCHIVE_OK, read_open_memory(a, p, s, 31));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a));
+}
+
+DEFINE_TEST(test_read_format_zip_malformed)
+{
+       test_malformed1();
+}

diff --git a/libarchive/test/test_read_format_zip_malformed1.zip.uu b/libarchive/test/test_read_format_zip_malformed1.zip.uu
new file mode 100644 (file)
index 0000000..cbd21a8
--- /dev/null
+++ b/libarchive/test/test_read_format_zip_malformed1.zip.uu
@@ -0,0 +1,5 @@
+begin 644 test_read_format_zip_malformed1.zip
+M4$L#!#`P,#`P,#`P,#`P,#`P,#`P,#`P,#`$`!P`,#`P,#`P"0`P,#`P,#`P
+1,#!U>`L``80P,#`P,#`P,#``
+`
+end