From nobody Wed Nov 23 21:38:11 2022 X-Original-To: dev-commits-ports-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 4NHZHS3zrYz4h8SZ; Wed, 23 Nov 2022 21:38:12 +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 4NHZHS174bz43Mb; Wed, 23 Nov 2022 21:38:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669239492; 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=RdybNvHj4VXxLEsIJqEVmpxf7S11T/g26vOI/gOKaHk=; b=e6syxAw/Z3r4hF9Nes+bf/NxU2qVrafjtvdb0XDxIbp1H5yqGtEDP71BFYrCnDl/fL9rZn NTxW4/BLN3cmrx2AhxmG2RMMiWi2FBnqxikLJev10eCdsUI2pyT9cj4YoDKEAvutqDtTln OjBGslSu+rRqvOjDl+c85nUGG9dWFnPtOJdQOR/Voxc9OkZVIKfRQgGipbxp2IFNOdPjvE 9twAlBp09QxM8jV9b9rsBiFYgy7IVrnbUPDcL3jOYuc/A5088lQ4Wm34ZoEBy9silWqDHM Feq5ucPffvF0E+lo3RI4bVOpqy4qBMtoD+DFRFuga2oVH5xyiTEEga+yg1LUaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669239492; 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=RdybNvHj4VXxLEsIJqEVmpxf7S11T/g26vOI/gOKaHk=; b=vB9RFoRJslWUali9ecpu16tEKZ17jVqI7lQU4+62mMz0z4CbQYm8pug7fq68arz9arYyPk 3lc1EoqKMPbkqYiw41z4v1sYtT7dX8zMHKUoGcgw6Bk2KJuTAXgZLN9kTFmMuU1LvFhAZB D61siQ/pYjZ5Wr1wxEXLr73vqghbZci/37n+IbnnnyqT/Y3vMqPZc059r02DJOCCOs4feJ VXHWQA4QzCQD8hTQLCL8JSj2RqUjCWIJEx2qn0z3vz542Eh+wsvN5iOQulyZ99P2oLGx8a AjMTKkX+Y5cEB+/aSKGrWhXjNLdPUOYcYkVuKTW8fv70dvbcTGlbh0sFfDDjOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669239492; a=rsa-sha256; cv=none; b=S3B8gdEAVVwZciKq353MomPajV0xRkAsFf+TUB0Q14nkg428y79gwpWnVQaTe2mMWLtPnq XGFX/iGL6XEX964hK2FkghsIpEv4sZLyaoBY7nhezroxpZ40MO27IM2loXQ9OgWlZAQ8t5 0+JHn3o54Git0+7AlUJbIAeSuc6/djQENL/elqkKbe0LJHFswY7UItFUnQAcAtvEEH1g1U uVgxDMVfnEdZM9dI6LPUrs59VORARC2UZUusK516krBe65mFcMATNI37OV9Ua6N6Ar+9Tg u+LEv+o1EY73aAwfm4akknZhjI06CEYSNbhyYCQALvYjS3PGRnyPCg9KODlRLg== 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 4NHZHR6cGfzcXr; Wed, 23 Nov 2022 21:38:11 +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 2ANLcBbO023652; Wed, 23 Nov 2022 21:38:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ANLcB3i023651; Wed, 23 Nov 2022 21:38:11 GMT (envelope-from git) Date: Wed, 23 Nov 2022 21:38:11 GMT Message-Id: <202211232138.2ANLcB3i023651@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: b2e1fc123b74 - 2022Q4 - graphics/tiff: Fix CVE-2022-3970 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: b2e1fc123b74d1660567dbc7d83f8e0f74016887 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=b2e1fc123b74d1660567dbc7d83f8e0f74016887 commit b2e1fc123b74d1660567dbc7d83f8e0f74016887 Author: Cy Schubert AuthorDate: 2022-11-23 21:26:19 +0000 Commit: Cy Schubert CommitDate: 2022-11-23 21:37:32 +0000 graphics/tiff: Fix CVE-2022-3970 Fix: TIFFReadRGBATileExt(): fix (unsigned) integer overflow on strips/tiles > 2 GB Obtained from: Upstream 227500897dfb07fb7d27f7aa570050e62617e3be (merged as a05860a0872d323e3fbf4390187ce934dd2b165e) MFH: 2022Q4 Security: CVE-2022-3970 Security: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=53137 (cherry picked from commit 76ee9a3057a59e9a119e8ee4186072db806d90ea) --- graphics/tiff/Makefile | 1 + graphics/tiff/files/patch-libtiff_tif_getimage.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index 63744a0a6554..1b038a6b6930 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -1,5 +1,6 @@ PORTNAME= tiff DISTVERSION= 4.4.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= https://download.osgeo.org/libtiff/ diff --git a/graphics/tiff/files/patch-libtiff_tif_getimage.c b/graphics/tiff/files/patch-libtiff_tif_getimage.c new file mode 100644 index 000000000000..d3235c58968f --- /dev/null +++ b/graphics/tiff/files/patch-libtiff_tif_getimage.c @@ -0,0 +1,22 @@ +--- libtiff/tif_getimage.c.orig 2022-02-19 07:33:54.000000000 -0800 ++++ libtiff/tif_getimage.c 2022-11-23 11:36:14.192628000 -0800 +@@ -3058,15 +3058,15 @@ + return( ok ); + + for( i_row = 0; i_row < read_ysize; i_row++ ) { +- memmove( raster + (tile_ysize - i_row - 1) * tile_xsize, +- raster + (read_ysize - i_row - 1) * read_xsize, ++ memmove( raster + (size_t)(tile_ysize - i_row - 1) * tile_xsize, ++ raster + (size_t)(read_ysize - i_row - 1) * read_xsize, + read_xsize * sizeof(uint32_t) ); +- _TIFFmemset( raster + (tile_ysize - i_row - 1) * tile_xsize+read_xsize, ++ _TIFFmemset( raster + (size_t)(tile_ysize - i_row - 1) * tile_xsize+read_xsize, + 0, sizeof(uint32_t) * (tile_xsize - read_xsize) ); + } + + for( i_row = read_ysize; i_row < tile_ysize; i_row++ ) { +- _TIFFmemset( raster + (tile_ysize - i_row - 1) * tile_xsize, ++ _TIFFmemset( raster + (size_t)(tile_ysize - i_row - 1) * tile_xsize, + 0, sizeof(uint32_t) * tile_xsize ); + } +