From nobody Tue Jun 30 17:22:09 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 4gqVM61n5dz6jYyD for ; Tue, 30 Jun 2026 17:22: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gqVM53RTCz3tFF for ; Tue, 30 Jun 2026 17:22:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782840129; 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=h6UmD+E/vY0MDIVqesayzJRVTM0pQPcaiI+s0Zby0P4=; b=RK3McfR7N1rLNTWGVmpF2z3pKBHHSo5w9ZXoKHMpshG8cxXUsu+YnY43p4CTt3IhJOfVaN TefRD41dGeNqqyTRueKKLMHXxd0u/G/icv4XtqoeUgllCiuHZAZj8OuoisNo9MBv2b06Zc CrN9/FOkjZ5b/z8ZAEiuQzELhfqWar3PuAp9TAMF5TThOal8dXgFV/Did3Kk4WA7TAPqHX AsHIZv36UcVZKnFrGZvyMMH/9I/WIQvqySlF/7YSd3mwBHMnB9qkQHyUhz5XJkejR0FwoG rnbS1YrALigMhiaJHGzp+boAWXpNcHuEL0v2R5GM1oScA7zx7aBwoafS0iuHZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782840129; a=rsa-sha256; cv=none; b=RiiFMahFKaqiOIHr57xZec2esdxOCJUmMHJnZEIUZ1jigw2lAUHzBqiloX+vfmK25yM0JH 0qfxY9lU6QsoRaPZ/t/s1WUo9vVHTVh82yLkzvXeRQIbp6QhHZBfOdJzvjH7hvrIMeHvrt uzKSlkXiJiAj+y6osL3HSXpcq8a3qwUtwpdWGPVSgjH8mt3VwIqpeGsYfpx+C1QSCJ3ewY eLTjZU+aO8aa7ROC2GOfkIS5zQklNjaRQUAN/3DAt/p1bkc9zS8e+/vlPpTh2Z0zzIXGFx nJ2T9zU3joa6QJJ6J7N9i/XOLbwRsf9uicUZDgvrRdVsSOzvuvw8rNmcEebHOg== 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=1782840129; 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=h6UmD+E/vY0MDIVqesayzJRVTM0pQPcaiI+s0Zby0P4=; b=PfFxf6HJbc9eKlPaPrIfNqWTkLi2PAHJMQMpQhwdUSjasM7UvO+CDGTCybf9MDUWekhJMT DZ7uAP/RJltpFOg8YEp5MB1xrZnUX1Ld51dGQnanvdbwk8lxXhGiMrnb/4oxg/UV5AH4mv KkBH8yIFXFAe30WPOhs9pCmx1NDFzrkLCMHLw4Qk1K2vt/zxODaJ1uV1jrcruqmvr5La+K FKwzrFSwg2sYp8lskB/q4IwABD+sSDYAdfCd8APfTqWJcdxYn7xHRUUfLt6y6gC/50Cs6+ or5CFghZYh09MjpR+/X3juCcl6sSR0zzyugbX6qWhoxjujOvGniSfFGc1ZHEGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqVM526bZztjf for ; Tue, 30 Jun 2026 17:22:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46670 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 17:22:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 898206bd5bc1 - releng/15.1 - 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 898206bd5bc141c00955f92034c06c1f3374dac1 Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 17:22:09 +0000 Message-Id: <6a43fb41.46670.7d291d3@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=898206bd5bc141c00955f92034c06c1f3374dac1 commit 898206bd5bc141c00955f92034c06c1f3374dac1 Author: Mark Johnston AuthorDate: 2026-06-23 16:05:31 +0000 Commit: Mark Johnston CommitDate: 2026-06-29 19:16:41 +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)