From nobody Wed Feb 23 12:36:09 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 36F7219EFD3D; Wed, 23 Feb 2022 12:36:10 +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 4K3bB13l2Bz3Msv; Wed, 23 Feb 2022 12:36:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645619769; 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=1l34uxHs+Dy0mrIedp4JEsTZrpmMiL1WIQXAk9OxqII=; b=DmbUHAvvIIxLNlCscB0MpXg+AadLAOsHy+6vToJ7ZAqspVGpZrXHoVl5HD7baFZ5rzYQ8z ZmSdM64wPBz3zawTPA3+IdCCzrVzhboQtIyKQuBvvIb5y40i6aNI19Tnn2Q6ebHXnoG8Js bCDF6GIPWr5uFlT81zwma1wRJRfJw+Op4tvfdsdX2dVdX84uNcxaFIAG6aTd/TNO565N1a +u0lUY6E9hT7LV4DsrvQVzrcPTHHUX59+G6cJ5ERdJaJG4gBBQ9ML1l3Vjj4Nv1W6G5TT1 n9g7Iu6hes4RP4ifDiXXNIDv8G8rmm6NZQD5eNyzCfZLyBgBX/jvD5wFHYIwMQ== 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 3577E184BB; Wed, 23 Feb 2022 12:36:09 +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 21NCa9WR073115; Wed, 23 Feb 2022 12:36:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21NCa9EN073114; Wed, 23 Feb 2022 12:36:09 GMT (envelope-from git) Date: Wed, 23 Feb 2022 12:36:09 GMT Message-Id: <202202231236.21NCa9EN073114@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: 8342c11f27eb - stable/11 - 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/11 X-Git-Reftype: branch X-Git-Commit: 8342c11f27ebf504e25a00daad3351e1a508a774 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645619769; 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=1l34uxHs+Dy0mrIedp4JEsTZrpmMiL1WIQXAk9OxqII=; b=e7Uihn55T1jafO+OjUtehOv9YzVD++J1pcISPy3brSv5gIHHkS1cA38haYDCmTVkLZmwwo 44Bpim3/8saOp4qAqkYL2xzNgEsLd4Q6dC9+UByP6ONOOfYDFsiJAEXAmk4iBX4j43s504 E9y+I1ZZs9FE5VxaGmAY71k3EBq8MSDYlj0qwB3pX1c3iUiwj62QKc409LXJTjPQkMhdGf k4Sr9eOJqOl0e0Y7GcsZ4PuMngzpioxBNiRzBRmvWt0Kn35OW9ygYV08VoOl5nyizeNQ4f ew9LLLVK+R+05HP3h7MuVVNxhs0eWQCB2yyawIYbVhDoMZmSz578vr/cc27iJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645619769; a=rsa-sha256; cv=none; b=kK12QFZvOCX/IDQ4frT7eOWOA93YerCj72wyzFj4kiO76UEerh7tWCAgx73FfXnWobZLtx IPdWMqOrSbGoJZhbHLMxbqStcdz2v0lrpRtW4TfTJdzxdjeNm5Qf61BXuN038qxeAMmfKt qZNvfrscy2JRCMfp8cp2xwGUeb0Ti5/k0/m2EPiUMB6q7ilIiGD0P3qERX5t5Xv27ZlYe3 SgPeLQQhXlhZYXDq05kVMeEmAMqqPUyepcyHvSc0Ow/t5nmoapXF/yzQvu+QpPf0tClzzD aMCck/VOqPF/s3nmCFuayx2w9i06DU62xggpghkq34d2zPEoaiI91duLOwRdVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/11 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=8342c11f27ebf504e25a00daad3351e1a508a774 commit 8342c11f27ebf504e25a00daad3351e1a508a774 Author: Martin Matuska AuthorDate: 2022-02-21 11:06:54 +0000 Commit: Martin Matuska CommitDate: 2022-02-23 11:37:34 +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;