From nobody Wed Feb 23 11:36:00 2022 X-Original-To: dev-commits-src-branches@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 3E90D19E4E59; Wed, 23 Feb 2022 11:36:01 +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 4K3Yrd0fJQz3F6N; Wed, 23 Feb 2022 11:36:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645616161; 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=Swe62JyY5/3fSIXMbKSdXXmMkbqJE1DDNh9XgfIOMrk=; b=MB53HHN9HQzX/y8c7cXAeb3kz9cA/ACAM6upsOSK9udSG33A7dp5f2Z8m87/rjNoqwG9aO 8MV7ACOM8ULXUt7/cunU2i7HP3XBPi36G051H2MMRFgahuJEXDEBeWHt5vTLG52qbfKrMN 2UzTVi+KyADxIYRM5nWsWMBxLCdjzSF6xJRQ8S32xVHb4vkQ6EV2ITNBwYPM3ugsVSPUrI 413swhYBas6Z02M+dSRfImjSc+W06jJENLy0a/YCab+Us3QOb64zFFsD2dNdLNgoYywDp8 Y9Fn7sdIQdkzMMemTcYme0nqDBpCG40goJB844GgnHPXqr5oHQt3ees3ykeuhg== 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 B39C51717C; Wed, 23 Feb 2022 11:36:00 +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 21NBa0WI092433; Wed, 23 Feb 2022 11:36:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21NBa02p092432; Wed, 23 Feb 2022 11:36:00 GMT (envelope-from git) Date: Wed, 23 Feb 2022 11:36:00 GMT Message-Id: <202202231136.21NBa02p092432@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: 259a84aa0124 - stable/12 - libarchive: merge vendor bugfix List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/12 X-Git-Reftype: branch X-Git-Commit: 259a84aa012487342b2439d4c992b45d9930ec97 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645616161; 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=Swe62JyY5/3fSIXMbKSdXXmMkbqJE1DDNh9XgfIOMrk=; b=H1UmUgkEF6xTnW5OvK39VZ0fUoxkaDj9D4cTpfvvj9GWct1T+oLJEltTV5Tv+z9DB2Jl29 6F0fVyoPNjBaOJjuMqWr+oFX6IFKgQB8us9TGs/2vDFrqRsoiQ5Skfr99ojDk6uiYhB75F ILJ4M/zF4ix9Vl6BvEr1eOcG6dnZZJXp/bhD+BEP0BHqyRoMauEFQlbzTkEta77AfBf4q0 KAMDcGYf8Cal25Cbep6BR8/rf4phQRuaWq0m+Uz1An2plOU3IU8Ata0AmrD+ylIutryUOx MMx03fzAay9hg+M5vx+Zu/eN/Cw6xI+MnlrXRM2yFCjmOt0Xy6Jyv56hZZfGMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645616161; a=rsa-sha256; cv=none; b=ta9q2TPB+VmhCQ54gAyB3V6oEqvVIuWr14X0otkDhXjolcs6LT0LalxX8MIx+/EatzSuFC w/vOePI+bAHCkFk+rlQdIjSf7YLiAgvltmXRFMs69V/jbychRyr9nPDC/7iRBMk9WV78Ve SF8IBmD+VKh7aHSywARL4knRJNN2MbhZd3fQZ5TOpl1ETp6HBKbx7agT5FA+kgquN//LWI sDyh2Z6enynDJigc209ctLklPgufhTlf3SCTtUzbQkeuyOacmSg8eEmuKUNj892IMC2ke/ yIENiD6xSQrJqexoz6IwH69aSXTsMed1bPqWLNNjATIC5TcwKvQIRBD6ex0JLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=259a84aa012487342b2439d4c992b45d9930ec97 commit 259a84aa012487342b2439d4c992b45d9930ec97 Author: Martin Matuska AuthorDate: 2022-02-21 11:06:54 +0000 Commit: Martin Matuska CommitDate: 2022-02-23 10:01:42 +0000 libarchive: merge vendor bugfix OSS-Fuzz #44843 (security): RAR reader: fix null-dereference in RAR (v4) filter code (cherry picked from commit 5ccf909af9c1117172ff0742515da2d2e0cef89e) --- .../libarchive/libarchive/archive_read_support_format_rar.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/contrib/libarchive/libarchive/archive_read_support_format_rar.c b/contrib/libarchive/libarchive/archive_read_support_format_rar.c index 388484a76809..7a7318522650 100644 --- a/contrib/libarchive/libarchive/archive_read_support_format_rar.c +++ b/contrib/libarchive/libarchive/archive_read_support_format_rar.c @@ -3328,20 +3328,25 @@ run_filters(struct archive_read *a) struct rar *rar = (struct rar *)(a->format->data); struct rar_filters *filters = &rar->filters; struct rar_filter *filter = filters->stack; - size_t start = filters->filterstart; - size_t end = start + filter->blocklength; + size_t start, end; int64_t tend; uint32_t lastfilteraddress; uint32_t lastfilterlength; int ret; + if (filters == NULL || filter == NULL) + return (0); + + start = filters->filterstart; + end = start + filter->blocklength; + filters->filterstart = INT64_MAX; tend = (int64_t)end; ret = expand(a, &tend); if (ret != ARCHIVE_OK) - return (ret); + return 0; if (tend < 0) - return (ARCHIVE_FATAL); + return 0; end = (size_t)tend; if (end != start + filter->blocklength) return 0;