From nobody Tue Jun 30 17:20:01 2026 X-Original-To: dev-commits-src-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 4gqVJd71ndz6jXsK for ; Tue, 30 Jun 2026 17:20: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gqVJd2zHPz3ppN for ; Tue, 30 Jun 2026 17:20:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782840001; 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=VsOpS51jnJMZNMzF1Z5+CLrZ74iyRaSKIuze6OC2G2M=; b=sPVpJ0NrLpzDi4N9asseJWY8+IHuNsS+0mrDxBmA5Yq7TvpmlJmaNKrlSF0uqR7tx2zOrc T2FVWNv9zHqbeTJBrWbiaXJ8AjRv5hXfqI+KMgD74vQMQpCnOSO5Cs5DnbEcHko0qZM9g+ /gWtwwrDmiLdPQUI0n//0/h9twdsQ/HNfR94degSChRMctD4il7YvCsXYXUzNfQRnzv+Vp pVUIlg8RJCjB7sS2cK3wxslfRUNQtaeHa+3u6ZL6OzUMNEvOGRC/JjLGmgXOdc0GH294hV aIeCgtQsorS4rAW3/T4xjNjHszg87P/xNg4p4alZ/uBJfapzbrSOYaDx9GEAnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782840001; a=rsa-sha256; cv=none; b=U4p07ahuvoqquUbmN1uvpuCBZO4iCmh+nXXXoLiDPg1uo8DNonDTBBe3pzceMwgozYONFw tz8ho4a0nEl6wjuNoPfre7H4UvVPOBZuOkU9gicAwD5xyGgfiR7XqQ1vfsGnUR+v++okSx UCcyFeHEov9bYR+/AaQsnO6JwNP7QoW3vlVynHTXV7TLhMHBvv7uSVQ7zYW8tarPQxe7t/ MYASYV4QLdVSnopbkOLGOI49Npbssfs5oUC43zrGAU8h1imWZvzIcangr5Aji3+sm1OnsQ vwyJhWUVIMMMmQEl+3/56O8freRu6tfTbuQzUyIgCXEMXA7cHX//bTl9qUed1Q== 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=1782840001; 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=VsOpS51jnJMZNMzF1Z5+CLrZ74iyRaSKIuze6OC2G2M=; b=qQax18s3lxGD+o9Lpf8kIghdtnpMGBUswrKBArCy5CSFrYH2LBcHtsybjFtWnagjb+fa3v x48TQvPHnPL4KDYPOyBs4eXL/Mk87Vlyron8dv0gegF/GYnaV6CMpVG+Qizl9LMaeAVEdp RlvXoDcbBvV2Mu3ZvHm8JnvJyCePvaBD1WW0mPY9/rCkJRvKXyGRI0kChK3NJvbtvzwgeG Pbs0JMkgp408zLDCwGvEmaDjTW0B+g6MkFFTxdNJY/pcO0r4N+az3/P7yCrLT7er2b5AGJ FEG4nUHASTGb6IMwcNZwy1BczstvvmwbgiIVwqcWiJ2zpG3aNVbbZ4vl4hvKFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqVJd1zXhztRY for ; Tue, 30 Jun 2026 17:20:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 455ad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 17:20:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 298e912b0d8d - stable/14 - iconv: Fix a buffer overflow in the HZ encoding List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 298e912b0d8deab54dbd77cea08615e4b146cc03 Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 17:20:01 +0000 Message-Id: <6a43fac1.455ad.8a07054@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=298e912b0d8deab54dbd77cea08615e4b146cc03 commit 298e912b0d8deab54dbd77cea08615e4b146cc03 Author: Mark Johnston AuthorDate: 2026-06-23 16:05:31 +0000 Commit: Mark Johnston CommitDate: 2026-06-30 17:00:22 +0000 iconv: Fix a buffer overflow in the HZ encoding wcrtomb may store up to 2 2-byte escape sequences to the state buffer in addition to the character itself. In the worst case, a 3-byte heap overflow is possible. Approved by: so Security: FreeBSD-SA-26:49.iconv Security: CVE-2026-58081 Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D57949 --- lib/libiconv_modules/HZ/citrus_hz.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libiconv_modules/HZ/citrus_hz.c b/lib/libiconv_modules/HZ/citrus_hz.c index db738b8f812e..e16ab3a8e34c 100644 --- a/lib/libiconv_modules/HZ/citrus_hz.c +++ b/lib/libiconv_modules/HZ/citrus_hz.c @@ -132,7 +132,7 @@ typedef struct { typedef struct { escape_t *inuse; int chlen; - char ch[ROWCOL_MAX]; + char ch[4 + ROWCOL_MAX]; } _HZState; #define _CEI_TO_EI(_cei_) (&(_cei_)->ei)