From nobody Tue Mar 29 11:22:38 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 145BB1A39F58; Tue, 29 Mar 2022 11:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KSRxV751fz4ct1; Tue, 29 Mar 2022 11:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648552959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=//dHokfek/EPf//EU/GYlyx9BvjGZcCPuLWcQEFfWqc=; b=bJ61qjVSvb4nnN23DTZ1lm1CZJhMuG0Ur5CyzRWx+zC6yswxy7sDnm0dP7kOV9mGMM2DSo bOtPIkuTAVg61lVd38F1YHATo4l3ESERCXcX4N3XU6veYyZIFzObVqFR/jwEA2wEI17wQc 7ygEhUPygjk/mrkQU2tkQjeaceRbiaGeE0LR17kZ0ZdrVf/8e4tMKY1cwowayaFGcyc0wk Vsn2o+e/UjZFtPzsetBkGwgaEvIBWkWPY/8n/5Ig8gmdKIrka5kEZmhWhvir4L3DG5RMBa 76XQiHaKQx1Dc4zeVl+7IKFzYOgtODKYgF50Rv+fBcCx460ml47eHCGteKfYJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D38A41DBB6; Tue, 29 Mar 2022 11:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22TBMcVs005962; Tue, 29 Mar 2022 11:22:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22TBMc7x005961; Tue, 29 Mar 2022 11:22:38 GMT (envelope-from git) Date: Tue, 29 Mar 2022 11:22:38 GMT Message-Id: <202203291122.22TBMc7x005961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 60338b806930 - stable/13 - libarchive: merge vendor bugfixes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 60338b80693000ed0f9812b90ca54d35fd077cd0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648552959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=//dHokfek/EPf//EU/GYlyx9BvjGZcCPuLWcQEFfWqc=; b=WjW1VS+f0hCoC7oiICVBikZ+Z0eF/9pHm4z75rj9y5huYOT55o5UZLkKSXxcJgIsccbN0S v0CK4jYFL9K5CkpVB0f9XL6KNkMkkWW7xEtBv4fuMZjRbqeiO0dg6dL02fK0wiYFvhAqYu ph2PsKItNzXGjTmqLfShtcpww62OfIIvJwpuB/VkwYrWXPN82I/7B7XsWMOfj9L6rMXBUJ VVuz8ClIz7ksEs6fiARPlhYUni3R4+Wr44gnLCrM3/7Lqt3nzcrRRptJoeWQo1HChjd19d uKQhDBXxbupX4jbLYqntaYA0VaS6EygYMIcP852yxJN91fdXtFUqHLnE323OqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648552959; a=rsa-sha256; cv=none; b=wppLxgzOD+AxP5W1lXgwIwzLo2gzRgnH8I6ve6HIPsh31AQmNP3t1gMDyxheH0lPSDFXd+ 7en/Kl+MlXDS703uhuJ1rqYrmmojGOG4bHDCkAKl7J9OQn5nF5VU9jCa35YWgdWvz6AThn W7tTLnnMly9AlpAedEMAogjm/huZeDYHbUi6Po6eVmAJGYZS0d10zFwRW3Vyhf3gSTAqAX kuNvVZpQg9LReZmVcKU4ZHhfF3dLLldUUU1IPOdR9+mH9uwXcbjzjhqEoSeE58Ba0ByosC 9bMMEJe5csnlXumTMb/P7DRwg8o/BJHcfvvP8opk/SqGxmvt8gze4CnfHDfzFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=60338b80693000ed0f9812b90ca54d35fd077cd0 commit 60338b80693000ed0f9812b90ca54d35fd077cd0 Author: Martin Matuska AuthorDate: 2022-03-26 10:04:36 +0000 Commit: Martin Matuska CommitDate: 2022-03-29 11:09:04 +0000 libarchive: merge vendor bugfixes Bugfixes: IS #1672 and OSS-Fuzz #38766: (zip reader) fix possible out-of-bounds read in zipx_lzma_alone_init() PR #1676: (mtree reader) remove the unused variable "detected_bytes" PR #1674: (doc) fix use of At mdoc(7) macro in cpio.5 (cherry picked from commit 0c9c2eb394b4a5694bc5ea11b326f334c735c813) --- contrib/libarchive/libarchive/archive_read_disk_posix.c | 7 ++++++- contrib/libarchive/libarchive/archive_read_support_format_mtree.c | 5 +---- contrib/libarchive/libarchive/archive_read_support_format_zip.c | 2 +- contrib/libarchive/libarchive/cpio.5 | 2 +- lib/libarchive/config_freebsd.h | 1 + 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/contrib/libarchive/libarchive/archive_read_disk_posix.c b/contrib/libarchive/libarchive/archive_read_disk_posix.c index d0e1f35c8291..2b39e672b49c 100644 --- a/contrib/libarchive/libarchive/archive_read_disk_posix.c +++ b/contrib/libarchive/libarchive/archive_read_disk_posix.c @@ -109,6 +109,11 @@ __FBSDID("$FreeBSD$"); #define O_CLOEXEC 0 #endif +#if defined(__hpux) && !defined(HAVE_DIRFD) +#define dirfd(x) ((x)->__dd_fd) +#define HAVE_DIRFD +#endif + /*- * This is a new directory-walking system that addresses a number * of problems I've had with fts(3). In particular, it has no @@ -2428,7 +2433,7 @@ tree_dir_next_posix(struct tree *t) #else /* HAVE_FDOPENDIR */ if (tree_enter_working_dir(t) == 0) { t->d = opendir("."); -#if HAVE_DIRFD || defined(dirfd) +#ifdef HAVE_DIRFD __archive_ensure_cloexec_flag(dirfd(t->d)); #endif } diff --git a/contrib/libarchive/libarchive/archive_read_support_format_mtree.c b/contrib/libarchive/libarchive/archive_read_support_format_mtree.c index bfcec220285d..96eb133ed361 100644 --- a/contrib/libarchive/libarchive/archive_read_support_format_mtree.c +++ b/contrib/libarchive/libarchive/archive_read_support_format_mtree.c @@ -692,7 +692,7 @@ detect_form(struct archive_read *a, int *is_form_d) { const char *p; ssize_t avail, ravail; - ssize_t detected_bytes = 0, len, nl; + ssize_t len, nl; int entry_cnt = 0, multiline = 0; int form_D = 0;/* The archive is generated by `NetBSD mtree -D' * (In this source we call it `form D') . */ @@ -728,8 +728,6 @@ detect_form(struct archive_read *a, int *is_form_d) * character of previous line was '\' character. */ if (bid_keyword_list(p, len, 0, 0) <= 0) break; - if (multiline == 1) - detected_bytes += len; if (p[len-nl-1] != '\\') { if (multiline == 1 && ++entry_cnt >= MAX_BID_ENTRY) @@ -745,7 +743,6 @@ detect_form(struct archive_read *a, int *is_form_d) keywords = bid_entry(p, len, nl, &last_is_path); if (keywords >= 0) { - detected_bytes += len; if (form_D == 0) { if (last_is_path) form_D = 1; diff --git a/contrib/libarchive/libarchive/archive_read_support_format_zip.c b/contrib/libarchive/libarchive/archive_read_support_format_zip.c index 3456c100c6f5..75df44ba93aa 100644 --- a/contrib/libarchive/libarchive/archive_read_support_format_zip.c +++ b/contrib/libarchive/libarchive/archive_read_support_format_zip.c @@ -1667,7 +1667,7 @@ zipx_lzma_alone_init(struct archive_read *a, struct zip *zip) */ /* Read magic1,magic2,lzma_params from the ZIPX stream. */ - if((p = __archive_read_ahead(a, 9, NULL)) == NULL) { + if(zip->entry_bytes_remaining < 9 || (p = __archive_read_ahead(a, 9, NULL)) == NULL) { archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, "Truncated lzma data"); return (ARCHIVE_FATAL); diff --git a/contrib/libarchive/libarchive/cpio.5 b/contrib/libarchive/libarchive/cpio.5 index 837a45692e3b..c71018b1996e 100644 --- a/contrib/libarchive/libarchive/cpio.5 +++ b/contrib/libarchive/libarchive/cpio.5 @@ -354,7 +354,7 @@ while working in AT&T's Unix Support Group. It appeared in 1977 as part of PWB/UNIX 1.0, the .Dq Programmer's Work Bench derived from -.At 6th Edition UNIX +.At v6 that was used internally at AT&T. Both the new binary and old character formats were in use by 1980, according to the System III source released diff --git a/lib/libarchive/config_freebsd.h b/lib/libarchive/config_freebsd.h index 0e8ac64eba47..20230ca26adf 100644 --- a/lib/libarchive/config_freebsd.h +++ b/lib/libarchive/config_freebsd.h @@ -98,6 +98,7 @@ #define HAVE_DECL_UINT64_MAX 1 #define HAVE_DECL_UINTMAX_MAX 1 #define HAVE_DIRENT_H 1 +#define HAVE_DIRFD 1 #define HAVE_DLFCN_H 1 #define HAVE_D_MD_ORDER 1 #define HAVE_EFTYPE 1