From nobody Wed Nov 23 21:33:01 2022 X-Original-To: dev-commits-ports-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 4NHZ9T5Dpmz4h7rh; Wed, 23 Nov 2022 21:33: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 4NHZ9T4kGCz42DY; Wed, 23 Nov 2022 21:33:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669239181; 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=P0HhjT8Beuih+PHAVBfUJ/FFL2viojLsw/ZiP11s5Yc=; b=h2bKujJVmRmg/P34r0cafu682hYRvsMJtUEq42fIm/gPkm7TQT6jqL8Lbdalrb6LhP4UIe 1u8cHJqK69PDBONH/V41nykdie/HPMxUg4iPF6MmDy1bCWxamBziIctweSMhPHVOv2JW4Q UsgBgU3So9FutQsRoMAdx7nOqwLUv2c7QEMFeVpos4qhdPcOYc4l2TU7/QfL33I82E1uaW Q7arkauOMwUJDab7yi+egGJVRItcCF8MesX7X26YIGQZHiffa+psMMhReivtIAVZWaMso7 4kCol6nl/XAG2NFwjzTulwVZazYnvFkYQzKgDHXwX8jk4njYXVLkMpHpxYwhRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669239181; 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=P0HhjT8Beuih+PHAVBfUJ/FFL2viojLsw/ZiP11s5Yc=; b=yxbXzosrpb45yxAeGDnTDOEUomWJfEude11KrWA0ou0yKMjjckMNF6vt4+XJLX5wZ300Xe w51M5eMHRaJw4HwZ5R69T7RfZkasBWUjgAUouuioZdnunyIUHJOV/3T7SuwIQrpyIV9/5N Y6OBuWcsRIdO6YlqcK86n0DhRARcgM7c5HJO3S4OzSdTYsFzb41qlXHrNSAugqi7HhYQ2W rKW1z1kxdKMQGu6HvmAibu4jqUwmMVf0uct5G6TedVeGfqCrCgFQat/Ts8KqGneS3efNeH SHYLC99yCErfx2qO0sa3Tcm/CqTJ4BXW+pTLw4+7nRmWGOvnSCCNVInfnFOJow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669239181; a=rsa-sha256; cv=none; b=jvZJys6jy1m86Jp9PzS9EaWLhVY9WUIv6K6K3EK86twYVRaLTGvZy1i+8Gk1K97tqcsyWn wMswRINt10EtoSe0sVwm/idzO8jP896oXh3gPMtqTZt4VEaQ0MGlTtOmrgJSwJtHassTW2 9atl7oytAIxN2XYpU+AE0QFI/XYjhyovZ6MXOtaTCn9PYJSfOXh++A2nx/CALIx89kusPN R+8ApE+9v0vVmvvnJYnDtzwYim6mVFeQU+S7KN43HztVsVrCtpGS614VirefkFuBQRt70k p8y4El04IFUsvYPzRJppl742Qc1uuPHXvupMHv/EhiH6lypcKC6/tJp5VmQo1g== 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 4NHZ9T3nhrzcJc; Wed, 23 Nov 2022 21:33:01 +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 2ANLX1rs022902; Wed, 23 Nov 2022 21:33:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ANLX1mf022901; Wed, 23 Nov 2022 21:33:01 GMT (envelope-from git) Date: Wed, 23 Nov 2022 21:33:01 GMT Message-Id: <202211232133.2ANLX1mf022901@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 76ee9a3057a5 - main - graphics/tiff: Fix CVE-2022-3970 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: 76ee9a3057a59e9a119e8ee4186072db806d90ea Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=76ee9a3057a59e9a119e8ee4186072db806d90ea commit 76ee9a3057a59e9a119e8ee4186072db806d90ea Author: Cy Schubert AuthorDate: 2022-11-23 21:26:19 +0000 Commit: Cy Schubert CommitDate: 2022-11-23 21:32:43 +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 --- 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 ); + } +