From nobody Tue Jun 30 17:19:20 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 4gqVHs5Pp5z6jXpY for ; Tue, 30 Jun 2026 17:19:21 +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 4gqVHr2HFxz3ndH for ; Tue, 30 Jun 2026 17:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782839960; 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=5yP5SLZ/QYTWg/51m3R7WOP0u0sMigi3WRKYz0Uta3A=; b=mXHgz1wO2Na59h1234OpKRN2SmRidg6w5CWRB008AA8GYexFB10bTC7dZUGXiIxR61esiQ Glh0n/72rOHU9o3XNyxYUPtVuQIE1rHscx4IyQ/pkPXiAEgMaSu9e/pSke2GpOHAAH4cjh Ax0lD/XhhDpgCHRJ/bwjLyd2lwwkuP2TuvjP6hMBrFKoC1FetQH1lf1Z/CUZbQL0lo2QwI CAia2cwihF9g3ITtVz5dS5/U9tXxQy/IxWFS4s+WyzhuQT5h6gZsqTfikyNRMlh9EWhA4T wfKbNFFc6TQ+/FADWV4jCkYqo+9aYxq3fXRwjbo9n1xDMisM1BMgh60pLtPhzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782839960; a=rsa-sha256; cv=none; b=YlOno3k+DM95veI9Wzpq6VDS2ujzG47H6vK3HAkSHZD1D4PEX/QWmEGux3IsIAeOtJ7Aar 3a3FPkiE3yVWVh+6amRxah6H49ZIBpi61TBuZqaLNf+qfDHr1WtcmjehUH34gzyHYQncF4 AJ0vCMaU6f0h7ZaiWAruFoa8IwQEmqu/CMt32Gj3woGgGgMRCWoLYrIGjzuBE9woSzJOlR lhP1cvrIouI8/ODpDNe8xSIEePxOKIzhbWjsX0yQJbkCJjoxdu5YC8gqZEHe92cGvBQgFa avjXorzGzokLrRVqO+QAmbfzSM2m/EDmzhvDG6ap9FmfnQR44QhgC2897NhrXA== 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=1782839960; 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=5yP5SLZ/QYTWg/51m3R7WOP0u0sMigi3WRKYz0Uta3A=; b=cQeetXhabMoeisPLrC3iXbWA3F8Otj3G2A3QIKWAy1DqEK1DSdRVBR2Tcu3erRpZVcbwHo +5Qboki6RI9UaEMJrfa0z9TqqLBB0/+L9kWU2QcV9GHKVMK/C+KyZcKrdS++Pzv/XWjR81 iqNO6MZhMU/3gCrHGif1HcYfmBIM8cbKmQtwdEVacPcVQ12iz0cGcJgSFTqWoryf59WNbb TUG3X129UqHBJ/dAgClwXVy7tedUwH6f2P87Wo+lkIYcYFv49l9zAu+yM5yhDxACNn2Gpl gsdnpLTwhrwfY9EbT+/jWoefv31tqx3CaXSEYDTADWyn+HsX1l1n1kpfygu5VA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqVHr10fQzt9W for ; Tue, 30 Jun 2026 17:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44ba0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 17:19:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 8bc3abb7d71e - main - 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/main X-Git-Reftype: branch X-Git-Commit: 8bc3abb7d71eebe6819af1e61640067733e596dc Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 17:19:20 +0000 Message-Id: <6a43fa98.44ba0.2b7992fa@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8bc3abb7d71eebe6819af1e61640067733e596dc commit 8bc3abb7d71eebe6819af1e61640067733e596dc Author: Mark Johnston AuthorDate: 2026-06-23 16:05:31 +0000 Commit: Mark Johnston CommitDate: 2026-06-30 17:00:23 +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)