From nobody Tue Jun 30 17:21:11 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 4gqVL10qSjz6jYVd for ; Tue, 30 Jun 2026 17:21:13 +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 4gqVL00c3Fz3rV3 for ; Tue, 30 Jun 2026 17:21:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782840072; 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=bDuZCxb2eoJHTwYn/lBD4MYqPrt/3dozbmTC1RtkKro=; b=Ve8yy712AJXHqXiF+XTwOhPOiZBYFFCDhRfOjfB142X6zKYpEGgQkgnfdA2yLXMv6PS5Rp 0DuXIcQ8QWLB8HYS1ej+LuCcuHUrqsNys9oAw26NrdyIx0LQuzvMwb5HrvFstfb+ROKBVn 2AN7czSuI1YhRylJxNsZUPNow32kQncqgIb+f+YzuWeGtStRXbkrZPYd30bwBJSe/apUrn 4q4ybwkiAGqkv3ODvX1UHOpXOWVGVoKxUtsQrn6FY3aOt6JgDgPGzZp/QIqXHRdRhPfoOG lTzcQq/pBpVr0PWjTcoYKJ5SZI3GhljrnqHS7xrv4/cB4on8daKQEJJQz3NgmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782840072; a=rsa-sha256; cv=none; b=PepJVyoy7o0X/6qKVrEDxuPxQwrH+tvDMDOZYwTAUzxgaMUbQ2CxN5/7NT7YvsA8Sqvqjn k0aPTlKZK+LQlppbV8l/taIaeIDNbyFy44zRCu2/n6dfgaUV0ozpI5be+l733WuVxxE6uq f26bs7ycg79ISAXjI0fQevf7/53aq3mHG0uv9R+qWggLlcfZMuT1N07N7gnAwMOY/I9vLR pD7Wis4C88xlOsw1UZ2pWkQnrw1oAw5yOIkzqtQvpc+4CVTLhtQXeY5TyKFBAKdTA59vrK 1cQ3qxFlILN2X98n2E/GYFz/QtND9Z1rZg2IkoU9SU71aOm138W2KgPC4FLgRA== 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=1782840072; 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=bDuZCxb2eoJHTwYn/lBD4MYqPrt/3dozbmTC1RtkKro=; b=LZCX/9ouWB9heFIJeSMyQbVshFJ7/a0vfYpn6R9JrBtFibd9m4WqCxfAc+eoB8ugWCytFa Pe0S+sIEtdiZFHPyQmOK/IhIZQs6Odx9s+41uKzqJfZZc+ucUmDR6r+r/ZhmhDNB+QzlJ1 e/Hf7goIBnAl4elb9bEfXUHT81OgpaI//5nuUK1hESAykvedhaUrI95ECwE548u8Zkv8cf ns3FRB6bTuonaDtjCIfnJfWV/jzXIJSK5bGFftRqJyYixVqMDLeZYg/uaVvnrR4hNtkhkw Bw/7cwodmoAHFPB6gR89lNpTSdttx9kDikRxv1eXaKiKiRTb04BKteSdE4NAvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqVKz657Pztmy for ; Tue, 30 Jun 2026 17:21:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44cf5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 17:21:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ce422ff3fcc6 - releng/14.4 - 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/14.4 X-Git-Reftype: branch X-Git-Commit: ce422ff3fcc621bd6857c69fea0b2e637c319ef3 Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 17:21:11 +0000 Message-Id: <6a43fb07.44cf5.791a392e@gitrepo.freebsd.org> The branch releng/14.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ce422ff3fcc621bd6857c69fea0b2e637c319ef3 commit ce422ff3fcc621bd6857c69fea0b2e637c319ef3 Author: Mark Johnston AuthorDate: 2026-06-23 16:05:31 +0000 Commit: Mark Johnston CommitDate: 2026-06-29 21:26:44 +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)