]> CyberLeo.Net >> Repos - FreeBSD/stable/10.git/commit
MFC r310866,310868,310870,311903,313074:
authormm <mm@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Sat, 11 Feb 2017 00:56:18 +0000 (00:56 +0000)
committermm <mm@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Sat, 11 Feb 2017 00:56:18 +0000 (00:56 +0000)
commitbedab702094c38a7aec2a44a7ba4adf886d100b0
tree902a0c1fa27c571837faf79563145142ba5a2fcb
parent9d749f0c73d4aa14cb1a267476fac8302d49454c
MFC r310866,310868,310870,311903,313074:
Sync libarchive with vendor.

MFC r310866:
  PR #771: Add NFSv4 ACL support to pax and restricted pax

  NFSv4 ACL information may now be stored to and restored from tar archives.
  ACL must be non-trivial and supported by the underlying filesystem, e.g.
  natively by ZFS or by UFS with the NFSv4 ACL enable flag set.

MFC r310868:
  PR #843: Fix memory leak of struct archive_entry in cpio/cpio.c
  PR #851: Spelling fixes
  Fix two protoypes in manual page archive_read_disk.3

MFC r310870:
  Use __LA_DEPRECATED macro with functions deprecated in 379867e

MFC r311903:
  #691: Support for SCHILY.xattr extended attributes
  #854: Spelling fixes

  Multiple fixes in ACL code:
  - prefer acl_set_fd_np() to acl_set_fd()
  - if acl_set_fd_np() fails, do no fallback to acl_set_file()
  - do not warn if trying to write ACLs to a filesystem without ACL support
  - fix id handling in archive_acl_(from_to)_text*() for NFSv4 ACLs

MFC r313074:
  - support extracting NFSv4 ACLs from Solaris tar archives
  - bugfixes and optimizations in the ACL code
  - multiple fixes in the test suite
  - typo and other small bugfixes

  Security fixes:
  - cab reader: endless loop when parsing MSZIP signature (OSS-Fuzz 335)
  - LHA reader: heap-buffer-overflow in lha_read_file_header_1()
    (CVE-2017-5601)
  - LZ4 reader: null-pointer dereference in lz4_filter_read_legacy_stream()
    (OSS-Fuzz 453)
  - mtree reader: heap-buffer-overflow in detect_form() (OSS-Fuzz 421, 443)
  - WARC reader: heap-buffer-overflow in xstrpisotime() (OSS-Fuzz 382, 458)

  Memory leak fixes:
  - ACL support: free memory allocated by acl_get_qualifier()
  - disk writer: missing free in create_filesystem_object()
  - file reader: fd leak (Coverity 1016755)
  - gnutar writer: fix free in archive_write_gnutar_header()
    (Coverity 101675)
  - iso 9660 reader: missing free in parse_file_info()
    (partial Coverity 1016754)
  - program reader: missing free in __archive_read_program()
  - program writer: missing free in __archive_write_program_free()
  - xar reader: missing free in xar_cleanup()
  - xar reader: missing frees in expat_xmlattr_setup()
    (Coverity 1229979-1229981)
  - xar writer: missing free in file_free()
  - zip reader: missing free in zip_read_local_file_header()

List of all libarchive issues at OSS-Fuzz:
https://bugs.chromium.org/p/oss-fuzz/issues/list?can=1&q=libarchive

Security: CVE-2017-5601

git-svn-id: svn://svn.freebsd.org/base/stable/10@313571 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
102 files changed:
ObsoleteFiles.inc
contrib/libarchive/NEWS
contrib/libarchive/cpio/cpio.c
contrib/libarchive/libarchive/archive_acl.c
contrib/libarchive/libarchive/archive_acl_private.h
contrib/libarchive/libarchive/archive_entry.c
contrib/libarchive/libarchive/archive_entry.h
contrib/libarchive/libarchive/archive_entry_acl.3
contrib/libarchive/libarchive/archive_entry_locale.h
contrib/libarchive/libarchive/archive_entry_strmode.c
contrib/libarchive/libarchive/archive_match.c
contrib/libarchive/libarchive/archive_platform.h
contrib/libarchive/libarchive/archive_random.c
contrib/libarchive/libarchive/archive_rb.c
contrib/libarchive/libarchive/archive_read_disk.3
contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c
contrib/libarchive/libarchive/archive_read_disk_posix.c
contrib/libarchive/libarchive/archive_read_open_filename.c
contrib/libarchive/libarchive/archive_read_support_filter_lz4.c
contrib/libarchive/libarchive/archive_read_support_filter_lzop.c
contrib/libarchive/libarchive/archive_read_support_filter_program.c
contrib/libarchive/libarchive/archive_read_support_format_7zip.c
contrib/libarchive/libarchive/archive_read_support_format_cab.c
contrib/libarchive/libarchive/archive_read_support_format_cpio.c
contrib/libarchive/libarchive/archive_read_support_format_iso9660.c
contrib/libarchive/libarchive/archive_read_support_format_lha.c
contrib/libarchive/libarchive/archive_read_support_format_mtree.c
contrib/libarchive/libarchive/archive_read_support_format_rar.c
contrib/libarchive/libarchive/archive_read_support_format_tar.c
contrib/libarchive/libarchive/archive_read_support_format_warc.c
contrib/libarchive/libarchive/archive_read_support_format_xar.c
contrib/libarchive/libarchive/archive_read_support_format_zip.c
contrib/libarchive/libarchive/archive_string.c
contrib/libarchive/libarchive/archive_string.h
contrib/libarchive/libarchive/archive_string_composition.h
contrib/libarchive/libarchive/archive_write.c
contrib/libarchive/libarchive/archive_write_add_filter_program.c
contrib/libarchive/libarchive/archive_write_add_filter_xz.c
contrib/libarchive/libarchive/archive_write_disk_acl.c
contrib/libarchive/libarchive/archive_write_disk_posix.c
contrib/libarchive/libarchive/archive_write_open.3
contrib/libarchive/libarchive/archive_write_set_format_7zip.c
contrib/libarchive/libarchive/archive_write_set_format_gnutar.c
contrib/libarchive/libarchive/archive_write_set_format_iso9660.c
contrib/libarchive/libarchive/archive_write_set_format_pax.c
contrib/libarchive/libarchive/archive_write_set_format_warc.c
contrib/libarchive/libarchive/archive_write_set_format_xar.c
contrib/libarchive/libarchive/archive_write_set_format_zip.c
contrib/libarchive/libarchive/libarchive-formats.5
contrib/libarchive/libarchive/tar.5
contrib/libarchive/libarchive/test/main.c
contrib/libarchive/libarchive/test/test.h
contrib/libarchive/libarchive/test/test_acl_nfs4.c
contrib/libarchive/libarchive/test/test_acl_pax.c
contrib/libarchive/libarchive/test/test_acl_pax_nfs4.tar.uu [new file with mode: 0644]
contrib/libarchive/libarchive/test/test_acl_pax_posix1e.tar.uu [moved from contrib/libarchive/libarchive/test/test_acl_pax.tar.uu with 99% similarity]
contrib/libarchive/libarchive/test/test_acl_platform_nfs4.c [moved from contrib/libarchive/libarchive/test/test_acl_freebsd_nfs4.c with 55% similarity]
contrib/libarchive/libarchive/test/test_acl_platform_posix1e.c [moved from contrib/libarchive/libarchive/test/test_acl_freebsd_posix1e.c with 52% similarity]
contrib/libarchive/libarchive/test/test_acl_posix1e.c
contrib/libarchive/libarchive/test/test_acl_text.c [new file with mode: 0644]
contrib/libarchive/libarchive/test/test_archive_read_add_passphrase.c
contrib/libarchive/libarchive/test/test_archive_string.c
contrib/libarchive/libarchive/test/test_compat_gtar.c
contrib/libarchive/libarchive/test/test_compat_solaris_tar_acl.c
contrib/libarchive/libarchive/test/test_compat_solaris_tar_acl.tar.uu
contrib/libarchive/libarchive/test/test_compat_star_acl.c [new file with mode: 0644]
contrib/libarchive/libarchive/test/test_compat_star_acl_nfs4.tar.uu [new file with mode: 0644]
contrib/libarchive/libarchive/test/test_compat_star_acl_posix1e.c [deleted file]
contrib/libarchive/libarchive/test/test_compat_uudecode.c
contrib/libarchive/libarchive/test/test_fuzz.c
contrib/libarchive/libarchive/test/test_read_disk_directory_traversals.c
contrib/libarchive/libarchive/test/test_read_filter_lzop.c
contrib/libarchive/libarchive/test/test_read_filter_lzop_multiple_parts.c
contrib/libarchive/libarchive/test/test_read_format_7zip.c
contrib/libarchive/libarchive/test/test_read_format_cpio_afio.c
contrib/libarchive/libarchive/test/test_read_format_isorr_bz2.c
contrib/libarchive/libarchive/test/test_read_format_zip.c
contrib/libarchive/libarchive/test/test_read_format_zip_comment_stored.c
contrib/libarchive/libarchive/test/test_read_format_zip_filename.c
contrib/libarchive/libarchive/test/test_read_format_zip_mac_metadata.c
contrib/libarchive/libarchive/test/test_read_format_zip_malformed.c
contrib/libarchive/libarchive/test/test_read_format_zip_nested.c
contrib/libarchive/libarchive/test/test_read_format_zip_padded.c
contrib/libarchive/libarchive/test/test_read_format_zip_sfx.c
contrib/libarchive/libarchive/test/test_read_format_zip_traditional_encryption_data.c
contrib/libarchive/libarchive/test/test_read_format_zip_winzip_aes.c
contrib/libarchive/libarchive/test/test_read_format_zip_winzip_aes_large.c
contrib/libarchive/libarchive/test/test_read_pax_schily_xattr.c [new file with mode: 0644]
contrib/libarchive/libarchive/test/test_read_pax_schily_xattr.tar.uu [new file with mode: 0644]
contrib/libarchive/libarchive/test/test_sparse_basic.c
contrib/libarchive/libarchive/test/test_write_disk_secure746.c
contrib/libarchive/libarchive/test/test_write_filter_lz4.c
contrib/libarchive/libarchive/test/test_write_filter_lzop.c
contrib/libarchive/libarchive/test/test_write_format_iso9660.c
contrib/libarchive/libarchive/test/test_write_format_iso9660_zisofs.c
contrib/libarchive/libarchive/test/test_write_format_zip_large.c
contrib/libarchive/libarchive/test/test_write_format_zip_zip64.c
contrib/libarchive/libarchive/xxhash.c
contrib/libarchive/tar/test/test_option_uid_uname.c
contrib/libarchive/tar/util.c
lib/libarchive/config_freebsd.h
lib/libarchive/tests/Makefile