svn commit: r349454 - in vendor/libarchive/dist: . build/ci/cirrus_ci libarchive libarchive/test

Martin Matuska mm at FreeBSD.org
Thu Jun 27 13:37:37 UTC 2019 

Author: mm
Date: Thu Jun 27 13:37:34 2019
New Revision: 349454
URL: https://svnweb.freebsd.org/changeset/base/349454

Log:
  Update vendor/libarchive/dist to git d6d3799d6b309593f271c4c319dfba92efc95772
  
  Relevant vendor changes:
    PR #1217: RAR5 reader - fix ARM filter going beyond window buffer boundary
              (OSS-Fuzz 15431)
    PR #1218: Fixes to sparse file handling

Added:
  vendor/libarchive/dist/build/ci/cirrus_ci/Dockerfile.fc30
  vendor/libarchive/dist/build/ci/cirrus_ci/Dockerfile.fc30.distcheck
  vendor/libarchive/dist/libarchive/test/test_read_format_rar5_arm_filter_on_window_boundary.rar.uu
Deleted:
  vendor/libarchive/dist/build/ci/cirrus_ci/Dockerfile.fc29
  vendor/libarchive/dist/build/ci/cirrus_ci/Dockerfile.fc29.distcheck
Modified:
  vendor/libarchive/dist/.cirrus.yml
  vendor/libarchive/dist/Makefile.am
  vendor/libarchive/dist/libarchive/archive_read.c
  vendor/libarchive/dist/libarchive/archive_read_disk_posix.c
  vendor/libarchive/dist/libarchive/archive_read_disk_windows.c
  vendor/libarchive/dist/libarchive/archive_read_support_format_rar5.c
  vendor/libarchive/dist/libarchive/test/test_read_format_rar5.c

Modified: vendor/libarchive/dist/.cirrus.yml
==============================================================================
--- vendor/libarchive/dist/.cirrus.yml	Thu Jun 27 13:31:55 2019	(r349453)
+++ vendor/libarchive/dist/.cirrus.yml	Thu Jun 27 13:37:34 2019	(r349454)
@@ -35,8 +35,6 @@ MacOS_task:
   matrix:
     osx_instance:
       image: mojave-xcode-10.2
-    osx_instance:
-      image: high-sierra-xcode-10.0
   prepare_script:
   - ./build/ci/cirrus_ci/ci.sh prepare
   configure_script:
@@ -50,9 +48,9 @@ MacOS_task:
   install_script:
   - ./build/ci/build.sh -a install
 
-Fedora_29_task:
+Fedora_30_task:
   container:
-    dockerfile: build/ci/cirrus_ci/Dockerfile.fc29
+    dockerfile: build/ci/cirrus_ci/Dockerfile.fc30
   matrix:
     env:
       BS: autotools
@@ -68,9 +66,9 @@ Fedora_29_task:
   install_script:
   - ./build/ci/build.sh -a install
 
-Fedora_29_distcheck_task:
+Fedora_30_distcheck_task:
   container:
-    dockerfile: build/ci/cirrus_ci/Dockerfile.fc29.distcheck
+    dockerfile: build/ci/cirrus_ci/Dockerfile.fc30.distcheck
   env:
     BS: autotools
   configure_script:

Modified: vendor/libarchive/dist/Makefile.am
==============================================================================
--- vendor/libarchive/dist/Makefile.am	Thu Jun 27 13:31:55 2019	(r349453)
+++ vendor/libarchive/dist/Makefile.am	Thu Jun 27 13:37:34 2019	(r349454)
@@ -865,6 +865,7 @@ libarchive_test_EXTRA_DIST=\
 	libarchive/test/test_read_format_rar5_symlink.rar.uu \
 	libarchive/test/test_read_format_rar5_truncated_huff.rar.uu \
 	libarchive/test/test_read_format_rar5_win32.rar.uu \
+	libarchive/test/test_read_format_rar5_arm_filter_on_window_boundary.rar.uu \
 	libarchive/test/test_read_format_raw.bufr.uu \
 	libarchive/test/test_read_format_raw.data.gz.uu \
 	libarchive/test/test_read_format_raw.data.Z.uu \

Added: vendor/libarchive/dist/build/ci/cirrus_ci/Dockerfile.fc30
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/libarchive/dist/build/ci/cirrus_ci/Dockerfile.fc30	Thu Jun 27 13:37:34 2019	(r349454)
@@ -0,0 +1,3 @@
+FROM fedora:30
+
+RUN dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison sharutils pkgconf libacl-devel libasan librichacl-devel bzip2-devel libzip-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel

Added: vendor/libarchive/dist/build/ci/cirrus_ci/Dockerfile.fc30.distcheck
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/libarchive/dist/build/ci/cirrus_ci/Dockerfile.fc30.distcheck	Thu Jun 27 13:37:34 2019	(r349454)
@@ -0,0 +1,3 @@
+FROM fedora:30
+
+RUN dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison sharutils pkgconf libacl-devel libasan librichacl-devel bzip2-devel libzip-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel groff ghostscript

Modified: vendor/libarchive/dist/libarchive/archive_read.c
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_read.c	Thu Jun 27 13:31:55 2019	(r349453)
+++ vendor/libarchive/dist/libarchive/archive_read.c	Thu Jun 27 13:37:34 2019	(r349454)
@@ -844,7 +844,8 @@ archive_read_data(struct archive *_a, void *buff, size
 	dest = (char *)buff;
 
 	while (s > 0) {
-		if (a->read_data_remaining == 0) {
+		if (a->read_data_offset == a->read_data_output_offset &&
+		    a->read_data_remaining == 0) {
 			read_buf = a->read_data_block;
 			a->read_data_is_posix_read = 1;
 			a->read_data_requested = s;

Modified: vendor/libarchive/dist/libarchive/archive_read_disk_posix.c
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_read_disk_posix.c	Thu Jun 27 13:31:55 2019	(r349453)
+++ vendor/libarchive/dist/libarchive/archive_read_disk_posix.c	Thu Jun 27 13:37:34 2019	(r349454)
@@ -1143,6 +1143,8 @@ _archive_read_next_header2(struct archive *_a, struct 
 		t->entry_fd = -1;
 	}
 
+	archive_entry_clear(entry);
+
 	for (;;) {
 		r = next_entry(a, t, entry);
 		if (t->entry_fd >= 0) {

Modified: vendor/libarchive/dist/libarchive/archive_read_disk_windows.c
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_read_disk_windows.c	Thu Jun 27 13:31:55 2019	(r349453)
+++ vendor/libarchive/dist/libarchive/archive_read_disk_windows.c	Thu Jun 27 13:37:34 2019	(r349454)
@@ -1126,6 +1126,8 @@ _archive_read_next_header2(struct archive *_a, struct 
 		t->entry_fh = INVALID_HANDLE_VALUE;
 	}
 
+	archive_entry_clear(entry);
+
 	while ((r = next_entry(a, t, entry)) == ARCHIVE_RETRY)
 		archive_entry_clear(entry);
 

Modified: vendor/libarchive/dist/libarchive/archive_read_support_format_rar5.c
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_read_support_format_rar5.c	Thu Jun 27 13:31:55 2019	(r349453)
+++ vendor/libarchive/dist/libarchive/archive_read_support_format_rar5.c	Thu Jun 27 13:37:34 2019	(r349454)
@@ -623,9 +623,9 @@ static int run_arm_filter(struct rar5* rar, struct fil
 	for(i = 0; i < flt->block_length - 3; i += 4) {
 		uint8_t* b = &rar->cstate.window_buf[
 		    (rar->cstate.solid_offset +
-		    flt->block_start + i) & rar->cstate.window_mask];
+		    flt->block_start + i + 3) & rar->cstate.window_mask];
 
-		if(b[3] == 0xEB) {
+		if(*b == 0xEB) {
 			/* 0xEB = ARM's BL (branch + link) instruction. */
 			offset = read_filter_data(rar,
 			    (rar->cstate.solid_offset + flt->block_start + i) &

Modified: vendor/libarchive/dist/libarchive/test/test_read_format_rar5.c
==============================================================================
--- vendor/libarchive/dist/libarchive/test/test_read_format_rar5.c	Thu Jun 27 13:31:55 2019	(r349453)
+++ vendor/libarchive/dist/libarchive/test/test_read_format_rar5.c	Thu Jun 27 13:37:34 2019	(r349454)
@@ -1215,3 +1215,18 @@ DEFINE_TEST(test_read_format_rar5_different_window_siz
 
 	EPILOGUE();
 }
+
+DEFINE_TEST(test_read_format_rar5_arm_filter_on_window_boundary)
+{
+	char buf[4096];
+	PROLOGUE("test_read_format_rar5_arm_filter_on_window_boundary.rar");
+
+	/* Return codes of those calls are ignored, because this sample file
+	 * is invalid. However, the unpacker shouldn't produce any SIGSEGV
+	 * errors during processing. */
+
+	(void) archive_read_next_header(a, &ae);
+	while(0 != archive_read_data(a, buf, sizeof(buf))) {}
+
+	EPILOGUE();
+}

Added: vendor/libarchive/dist/libarchive/test/test_read_format_rar5_arm_filter_on_window_boundary.rar.uu
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/libarchive/dist/libarchive/test/test_read_format_rar5_arm_filter_on_window_boundary.rar.uu	Thu Jun 27 13:37:34 2019	(r349454)
@@ -0,0 +1,9 @@
+begin 600 test_read_format_rar5_arm_filter_on_window_boundary.rar
+M4F%R(1H'`0"-[P+2``(''(`'`/[_(`#_!``"(0$``/X(TB`!'O___P@``/W_
+M_Q``_]U84%"0_P1LAFVQ9,S,M[$`20"#__\`_P#_`/G___!DSR0V2+$`20`Z
+M at R[_______\I:!<**- at P70D`KB1!<YOZFQ/___^<`^5L*0```/________\_
+M`0#__RE@%PHHV#!="0"N)$%S"```_?]84/7___]0D/\$;(9ML63,S/\R'Q\?
+M'Q\?'Q\?'Q\?'Q\?'[$`20"#__\`_P#_`/G___!DSR0V2+$`20`Z at R[_____
+0_Q\?'Q\?'Q\?'Q]5"E`*4```
+`
+end

More information about the svn-src-all mailing list