From nobody Tue Jun 30 17:21:39 2026 X-Original-To: dev-commits-src-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 4gqVLW5mhtz6jYng for ; Tue, 30 Jun 2026 17:21:39 +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 4gqVLW3Qwdz3s5b for ; Tue, 30 Jun 2026 17:21:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782840099; 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=EzyONbmW1bM+26ZNGEJS5Ce7lLZHtOGRYE+p3/uYni0=; b=GNV7PgJl743IOPY3VANcG2EbvJa3WfDoy4xhLs5NxyGUWKGvBXhBLWQuSoQtVBpoZcoQ8G YrRq+ux1n8TXq8YchTD2qbZkArmQl9BZQG4k/AGygZrF6ASw8N2RCABDOO70+JxgW8VnXP 0dGWmn7GfyfulQ5SRybcMJ+bo5wuISPlK1FX6pyWWmlyKGh1uUu2i19eI+HPvbxetG7ilL 4mHKQ0dtUsMvYXbc3VsobkpRk2HhfAxSz23N4PC8cSjoTWj8SESobZI1E+l8oSsWqV+Vn7 miqX/167qPs6OE0bNyodzn7lTFNVdBvpMSxFazlhg59VuqBNAXyGjEZH55CC7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782840099; a=rsa-sha256; cv=none; b=Q7hWSuJkJaXq7oYhaqy4niDMt1qiAApU5k5WMWczLOJJ15Yr/sWMrTHSTcqw3SSfRi2VOR 3KBQjmj8dSY+B/xYnLg/Gp6UObcZxl+f7DwlEmFSsOVcu20rDJQYnp/1SzsHNcnQnuOEek +k+bB8oH2oWGTfIHjunYD22+hU2iFugH0wYLMkv7CREkRXADG53AnOBiatTRY0j6pOF/v9 GJo9sjoaidIlGcGfKyR3GHQn+Ic1sx/rLnJebwrAeF1vo4bhRao/xKYzAfL9zBxNa82ts2 7GpH0Gk0wNxztiS5BwF0fGpMIcvK3C+lEn4pgobn2Be/rYDD/5IL2ZZ3KZc3SQ== 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=1782840099; 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=EzyONbmW1bM+26ZNGEJS5Ce7lLZHtOGRYE+p3/uYni0=; b=vsvaYzrbP89VTM7aQqaCa0W6wHW+PBla3mHfwUW4Uf/SlyMc3owbxo37qDzW1DwA//ld84 Wbu7PX7MLWWVoLJcbSQ0ywErCXCF0GisnfMTv62gPV2QxcOio4J7KqQreAcMYenXxMfW91 /xoiBxZNtDpWcqw1ByThhZ6wo3BYdvCWTDyYq5QQG2P6xGNXHSUEjaPRqk4QaUgrv7d4K4 YCyhEk5FkW8a6Y4frxngqadOUKghQcDW3+1mikZ3bVQDBsoYOQjKjSEvTmtmb7OTJF9SfF rbMBpTRK2Po/JbmyIe/Sq1oUay90C39fXaD0vAlx/ui8QYK5VuTLRnSPeQrMeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqVLW2WsrztqQ for ; Tue, 30 Jun 2026 17:21:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 446b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 17:21:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: fc6e7313929d - releng/15.0 - iconv: Fix a buffer overflow in the HZ encoding List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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.0 X-Git-Reftype: branch X-Git-Commit: fc6e7313929da2187c2e7662df03022c321e5320 Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 17:21:39 +0000 Message-Id: <6a43fb23.446b6.6d4d7eae@gitrepo.freebsd.org> The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fc6e7313929da2187c2e7662df03022c321e5320 commit fc6e7313929da2187c2e7662df03022c321e5320 Author: Mark Johnston AuthorDate: 2026-06-23 16:05:31 +0000 Commit: Mark Johnston CommitDate: 2026-06-30 02:32:58 +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)