From nobody Tue Jun 30 17:20:45 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 4gqVKT6Mn6z6jY7G for ; Tue, 30 Jun 2026 17:20:45 +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 4gqVKT3dShz3qs9 for ; Tue, 30 Jun 2026 17:20:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782840045; 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=4O+NChnA+3P7wtnf8UlKFMUvi4sKMEjik6aF+4DfPLQ=; b=ZqgSxLjqJDKNA/LeOnMXxnDSgxhhT9+zLqGWl4xrz9/RHWITh6BfKxscId3ZoFK9WZfaL0 lsTH8a9ib/OPNncelY4zGAYKdmApzJk8StUreINGDYsGPxE/hnT/P0pcFkKSvfr+fncsV5 dEU+UhZpoxUdrEcSJmlD6mtyP2w0bOPwN546RYQsdL+OGe8+pKif6Hzq1sizv8esMCgzRX uHpfCJX2yBFsYU2LEUI0ZyS3SUoy2oRIRqkPdNQBnl1Q8E8DNJu0VtDQYR4DAp7e+UHnsa jJZXgUkk69IVZl045wX6jppwCVzxAxT/0ukc/CivEUCL2T6DNxHnGNw7QcF+IQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782840045; a=rsa-sha256; cv=none; b=v7MRJuzaXDu+MvFlG2X/s/a7DHgnlnWNp2N/IsldDupvagfvccWjGUJQorF39TxgOrFzy7 yBQLZa9c5l++Gk/i8kyklKeFNlBEx21nLyaKv5BraJtu/4yrNLADkDGqFGggTLJRZ2CNXH CAAMW43KG4dytdPf5NFTNjXatP5qfT3sMbVJw/Vm+/LQfOwkgH5TANdTctdUQkxwgCpFbd 34SDQvNLVGYGtiazS/ju0a3PPyiq7MkXBHZHDsDjSLyFoekpTigVWmt31ukL+b/w4Npo+0 KC1mfOckT2DtEENuEJasiUERmmGaRnfaL9+4tDARovlI/LOW07+lte0f/HMaOA== 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=1782840045; 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=4O+NChnA+3P7wtnf8UlKFMUvi4sKMEjik6aF+4DfPLQ=; b=ZiJvXgysSrufAqStEZDLuf3oYlWcQgfOhmC9elHundZtGtQ/0SXbBzuc9Q+k+wh5CIDk+3 dNhuN3vl9vGujQvRp5PNcuAMpjx6AcmKe5izLcbZiyTvGi5Er6sjwYu1EBooKaaWIj3z5d oVGkrZd8Va/4tWpfLCdWAYx11eJQxqOKoNHg3GotEEypplRqwrVbV7yv+1AtUb8tyj3Kdb 88Pc0rgF6iP628JddGnVLxpOU0bVYDThrZ/ai9OGum+tr+xQ9b2pPSXYLAkedqsfP1g/xc Yu8OCc+yNfHTFf82uZbd6Tfd8tnpk1G1QgIQ7RCNUwIAQbXgIH2SBfepYszlMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqVKT2KGlztRy for ; Tue, 30 Jun 2026 17:20:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 444e8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 17:20:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0b49a3af873d - releng/14.3 - 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.3 X-Git-Reftype: branch X-Git-Commit: 0b49a3af873dd062538e806722348ef02dd20dac Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 17:20:45 +0000 Message-Id: <6a43faed.444e8.577b65da@gitrepo.freebsd.org> The branch releng/14.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0b49a3af873dd062538e806722348ef02dd20dac commit 0b49a3af873dd062538e806722348ef02dd20dac Author: Mark Johnston AuthorDate: 2026-06-23 16:05:31 +0000 Commit: Mark Johnston CommitDate: 2026-06-30 02:32:02 +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)