From nobody Sat Apr 11 08:26:09 2026 X-Original-To: dev-commits-ports-main@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 4ft6FZ3yySz6Y5PY for ; Sat, 11 Apr 2026 08:26: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ft6FZ0JsFz3VcB for ; Sat, 11 Apr 2026 08:26:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775895970; 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=Amw5ma24EQvz5dGIBmPqEnpE1GcKHEDA3LT4X8z8BYY=; b=wDli/zkBbmMCbkFQ7Iao6bPTA5ga7LIgsNUBg8j7Zw3wq0L444zi4Zrd82FJspjqAur/b1 WXAIeWbpx9+/YIciaBVBmzj8eJFZ8NM4gNpzt9DprDSzfmMEOZtUkj/SViPRV0y+C5mNtz qFKczpkitTCRLIgfsIAOJ78HstWlxfqn6b6FF7v+3xOQOVOJPZB9V2N6oaOzWffrzM+W6p LN6jKp9iGd+gWgwIyhPirn5xEkIyZrY+3q95GdlZpOQvV3DX7hdO4cZIIBjsug4x5tbga/ tH8Fpu4iLnWBpw7k6Ec0npZLaPLRYT5Pj0Ugd6AOuc9gXwOSgc9p4kfD7zKCVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775895970; a=rsa-sha256; cv=none; b=bcE7rGB16KsCwX4PluH1fR+HRAiyIV1T7RnOdq9eWhI2Aa6DPytkTtHadZmSGyPmPnkcOl tJa58Hq8eoS+LEPdr7RIUUnL7724SqLpp7CYM9gpM8s5/EYDcaHwbP3UFHfu4PGLIQLtMO I/UaRT28zM5WfI5sQcDqR1XXaLGXiSBmksJ+zg59BVfKKhyCpZEwcoqPz9VPzGekI9+aOA sRO5bXFwlno9Oso1bJbu0nk3La5nREQoaLMu6AG14kacBMpigVz0Eji49ZgWSWHa/hYzpu c0ftWQJvsdJZrE72Vwa2PHf4I0NdLWI6g6ziChSS76mUCX8TOa7rw+Uge9H7tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775895970; 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=Amw5ma24EQvz5dGIBmPqEnpE1GcKHEDA3LT4X8z8BYY=; b=A3p7Y8BGEBMEKr6lZcpAbnPvbRDZT2S5pvp1UqLeiWMzULTFMByONo9/Gy6D1fLuON54iB 06Mb41C9k8Hr1emjmOMysZ6Yeje6SJEChTdUXTPvh4yU4XtFCNDx07I59QrvfmNvqVnquo snAWuyzk9zi4+oRGzffFQhKLXGShhWvZbCQq74AcaBa959qD/8EGljE02kjLFWC5tjaDnw E8d9YuG0r4d317E2tncSbP6iLUAnjvcNAYkWiO283vz/2IbOL0hQ6qzMExGAfDCJVKP06u bqH1a2sa4MOuaRWoOFlFQLzb0CvFC/akdhD6yxgPd6Qt9dSgtT4Nui7tTKtMfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ft6FY52Vmz6Qj for ; Sat, 11 Apr 2026 08:26:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40011 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 11 Apr 2026 08:26:09 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: a7af345cb919 - main - graphics/tiff: Fix CVE-2026-4775 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a7af345cb919c0cab70b0801abaff2b528f1eaff Auto-Submitted: auto-generated Date: Sat, 11 Apr 2026 08:26:09 +0000 Message-Id: <69da05a1.40011.457ff26e@gitrepo.freebsd.org> The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a7af345cb919c0cab70b0801abaff2b528f1eaff commit a7af345cb919c0cab70b0801abaff2b528f1eaff Author: Daniel Engberg AuthorDate: 2026-04-11 06:03:40 +0000 Commit: Daniel Engberg CommitDate: 2026-04-11 08:26:02 +0000 graphics/tiff: Fix CVE-2026-4775 Backport upstream commit 782a11d6b5b61c6dc21e714950a4af5bf89f023c Reference: https://gitlab.com/libtiff/libtiff/-/commit/782a11d6b5b61c6dc21e714950a4af5bf89f023c PR: 294370 Reviewed by: desktop (arrowd) --- graphics/tiff/Makefile | 1 + graphics/tiff/files/patch-libtiff_tif__getimage.c | 38 +++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index f4c8b7119511..635c491ea844 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -1,5 +1,6 @@ PORTNAME= tiff DISTVERSION= 4.7.1 +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..c3c3ed3a62a0 --- /dev/null +++ b/graphics/tiff/files/patch-libtiff_tif__getimage.c @@ -0,0 +1,38 @@ +--- libtiff/tif_getimage.c.orig 2025-06-25 17:20:35 UTC ++++ libtiff/tif_getimage.c +@@ -2216,7 +2216,7 @@ DECLAREContigPutFunc(putcontig8bitYCbCr44tile) + uint32_t *cp1 = cp + w + toskew; + uint32_t *cp2 = cp1 + w + toskew; + uint32_t *cp3 = cp2 + w + toskew; +- int32_t incr = 3 * w + 4 * toskew; ++ const tmsize_t incr = 3 * (tmsize_t)w + 4 * (tmsize_t)toskew; + + (void)y; + /* adjust fromskew */ +@@ -2356,7 +2356,7 @@ DECLAREContigPutFunc(putcontig8bitYCbCr42tile) + DECLAREContigPutFunc(putcontig8bitYCbCr42tile) + { + uint32_t *cp1 = cp + w + toskew; +- int32_t incr = 2 * toskew + w; ++ const tmsize_t incr = 2 * (tmsize_t)toskew + w; + + (void)y; + fromskew = (fromskew / 4) * (4 * 2 + 2); +@@ -2512,7 +2512,7 @@ DECLAREContigPutFunc(putcontig8bitYCbCr22tile) + DECLAREContigPutFunc(putcontig8bitYCbCr22tile) + { + uint32_t *cp2; +- int32_t incr = 2 * toskew + w; ++ const tmsize_t incr = 2 * (tmsize_t)toskew + w; + (void)y; + fromskew = (fromskew / 2) * (2 * 2 + 2); + cp2 = cp + w + toskew; +@@ -2615,7 +2615,7 @@ DECLAREContigPutFunc(putcontig8bitYCbCr12tile) + DECLAREContigPutFunc(putcontig8bitYCbCr12tile) + { + uint32_t *cp2; +- int32_t incr = 2 * toskew + w; ++ const tmsize_t incr = 2 * (tmsize_t)toskew + w; + (void)y; + fromskew = (fromskew / 1) * (1 * 2 + 2); + cp2 = cp + w + toskew;