From nobody Wed Feb 23 09:56:55 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 0FA6119D12DA; Wed, 23 Feb 2022 09:56:57 +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 4K3WfJ3gp6z4h7F; Wed, 23 Feb 2022 09:56:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645610216; 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=w2QxrjYLzcsw0VnrHTIJOJtx7k8+L4xOR4GWDIStUQQ=; b=lWt5CBxyfeZacenkFU9nUSFUePEr5LY2Vo4TtGxd+vQvUC0hNbgQ6WP4eVO1oT+6XygCtU ehCr3xDc82NTHm3H3JzaBDjQkFZghBdfgNK3wXVd5gOlCHSDqJyMCmynHDB3VzhNhOWR3S hvIBgTAQPnEYP/Xhx8MGRVLMKv7L4TK7yS4stk7cTOI4ZtRQY+mMObyA2clk+JDagp6O7C qs+faq3AFrmkVuAH6R7OtWgqC8io6B+hLHldKIfqV9W4dMD1feJ3rbHnirOEYI1MZSz729 jxY9kSav+o1oOA5XvmPkMCRPwt+6GxR0gBCl7a/0wRXgxIIQVvoqCFAlIE8SLA== 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 19472160E2; Wed, 23 Feb 2022 09:56:56 +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 21N9utW4057572; Wed, 23 Feb 2022 09:56:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21N9utdB057571; Wed, 23 Feb 2022 09:56:55 GMT (envelope-from git) Date: Wed, 23 Feb 2022 09:56:55 GMT Message-Id: <202202230956.21N9utdB057571@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: c02608826f3c - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: c02608826f3c84f766749ae05b8e09214030cf1a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645610216; 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=w2QxrjYLzcsw0VnrHTIJOJtx7k8+L4xOR4GWDIStUQQ=; b=UcQgw086ePJde7+dPIdLjOH1/pVlNM92LVSgcJsCa7SmrcGkplsDs2gNF9e0plDbqmWiFo lSjlZG2lJue5d7R+E+FlSNxUNcvR2JAxTEWNXAHxGNYdtXytnEJGveLBnyPo8TQuwhz19S I9QidYVfejh5HQ/5UAfjO4IMd7AcX++fojWz9oDPWq71XSUVNke772+hgTGNAmO2LQjE26 KpDvVby912fkeAoJKx6INQ1K4kkf+Lv6o+vn8dcyyA+9o3KQr5qUFQRPNTlREXxcRqciY9 eNFuJsjZOA0pr8th0i/xF2MQo0XXcuXnskPHGZ6rQvXaqlTsNd2BZkcWeFaX5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645610216; a=rsa-sha256; cv=none; b=XdP7nAgU5DuhuyZP5tH9U1Qk+A4g+Bpb32GMu30jUVLat7Sw+jOs0JA0si98lsFVawfD13 oUnq0yyYog/8Xl2OjQcRbmjgPlXVISkLiCEa07XOs87pUAQ3gYJ3zVVQ7XT33zoTuDvSPj 8hyon0f0JVdVRn3ilP5W8pKCMyKSPV9MfV2T9R/OAYRoGqIZP1TruivwS342YiEiwADwHT C6HEGonTqgJMuviHU0BW+3WRaQacI2XvxBETBD7xKoogyukK/i/XR9egSeOZnX0754gYdC /DSXUdlDK6z211rn36Mf6ceguL0AJydp6npW+qJbvlIFdvjRrjcOXTHmX4GM4Q== 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=c02608826f3c84f766749ae05b8e09214030cf1a commit c02608826f3c84f766749ae05b8e09214030cf1a Author: Martin Matuska AuthorDate: 2022-02-21 11:06:54 +0000 Commit: Martin Matuska CommitDate: 2022-02-23 07:57:00 +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;