From nobody Tue Jun 30 17:20: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 4gqVK104kRz6jY3r for ; Tue, 30 Jun 2026 17:20: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 4gqVK02zYnz3q80 for ; Tue, 30 Jun 2026 17:20:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782840020; 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=gFYPY2BENkWRARx+Ir00lQ0OM6cYrzaqC8bzCi/TYrk=; b=fr+QwzF6LSTPgg83V9b8DNBjGEx0SZVwlqGshpQ4K2PfW5RnxtGNjx0OeIyTr6v4hkksLq wVgk0+RkffHDuhvutwjxvhX1qk1483RPbQrVrr/abTRFnqDmLedIe6ohxV4O9MeZfIbLAy qxQRrjxtcGle/5xA4ZaCJCXcQZVjGPwPWzuKPIc6K4j6ZmAUxiQkNiiZblV8qpwzM/Yq8A T2/aexNUa1nGBz1q4hKFLfacghazw7X2V8DxugZCD9q7zLGJAKXKxoO+P/qXqPowJBdbJz 39LKrkNDPR63m2YOUXb3H7e8VUYlNcUd4VigG7GyUTTzzMJmy8a0taFEN/V11w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782840020; a=rsa-sha256; cv=none; b=e/UM/qrKrgJ2vyqnXP0txgDQfQ7DrDYlHgFKK565xXo9iAfU0Yd7sHr1E8X+AfEc6hX6Yv 96X0OOvAi3QxSMyGKsnd3ajYQ3pODzR62OxMMg4pnXFwfj3z41T1mW+FCNBCYGphLuHwRj AYbmdkzoQsPt+TYvyDXhBYE6uC4w6sI8H8lDxvZ9Q8BeNCIazetOnxaOf/hYVjNa/oeSsg ueJByLqeFbmSJznN9kSba/vKLHBZKKYHgxpTlsPaHC+P4Kbh1bV6b73nakYpGWhgsS0Shc yLD6V6M3OAjNXTr/YWV+2jQDsHZ27fWVbs3ZxYTjibd9EIIsiurs7wNZKRnoZQ== 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=1782840020; 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=gFYPY2BENkWRARx+Ir00lQ0OM6cYrzaqC8bzCi/TYrk=; b=V+rgzs+5oZCOcagx6g0+f1dWOg1EJVKJS1FGa8By3woToF1popQ0Rd6FtOfg0Eb3Dy8U3i +qH042lme2D3vPuXNRX8twn6mlogY6LcDbwSKjnpjFCXRJ+x4emGQ8yl6AIMi3EOjTKRG8 uVpHEGM+NWdPC5q7Y0rr76NYSdcpew9hjowU33jzaClJLNR+Yz3H/BbqkQNPI4opWgLNDF +3nx3t68YXpZdcyFD2zuYKbE+90OH2gB9I5moQUQkUUs0LBI6c6amncnxRTHhq3e+1aPq5 Be4OlpFDjSPmbNhOFOq+TXRG2PlBfoco1YF/zJVkcCQ/0NG7o6vHMFiNYjNz1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqVK01jWzztRh for ; Tue, 30 Jun 2026 17:20:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45b76 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 17:20:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: abcc988af19e - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: abcc988af19ef53884b202916f97856680849a8c Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 17:20:20 +0000 Message-Id: <6a43fad4.45b76.19a9694a@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=abcc988af19ef53884b202916f97856680849a8c commit abcc988af19ef53884b202916f97856680849a8c Author: Mark Johnston AuthorDate: 2026-06-23 16:05:31 +0000 Commit: Mark Johnston CommitDate: 2026-06-30 17:00:27 +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)