From nobody Tue Jun 30 17:20:21 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 4gqVK20KZQz6jY8k for ; Tue, 30 Jun 2026 17:20:22 +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 4gqVK141gWz3qGG for ; Tue, 30 Jun 2026 17:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782840021; 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=E+6pvRZlO26mEWWORg78wFMmrCD3H8Xnjp7RcGbT1Pg=; b=Hf78a61rDS2ZqgENGOF0PIL6umm9MD8fYyCZ4bEJI6G/kZhxYvCWUGvoJi3wbAcESIoFzo ugslwyB0ipLhSurcQLeYmh/OB3wTp8nX6b59z6Qws3Dc471RCb8ghBYI4TYaiymZvaQ3hy DAan1Vqtbm5IgMdQE5HOXsmfiwS6wgqvC0YJ6T0vpxgJ7z+kLNWGptmyloUbfeAiDytZM6 ukD0zy2EBsilffO2kruJr4SOtVyJH6iJGGBUFDHHPaMkgtWoAOE1HHGkVojV37jEY6A1zl V/ayK0KWy14m2FcXMTdUfGQhJLFoQvuu0rm/IwVEESCyrM8XPICkM3/JAqvRtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782840021; a=rsa-sha256; cv=none; b=NJBoaJwpiFwpjkny9K1f/nxsUS8whmBM/hOxXSto4Yotbjc726WRf6m+EIeTqrXpVZ0tdF iIsQNv+1K49Pi31ji9yjkKKUNDv59r4VqvazMGN1oHBTbEo5WI+fQV0TfVWpmY9dAb5aqR uHp9l2PdtZbRwpmvGgaw8NiwEWcOIrvYHPwSBEVsQwkmuyCS6hgewVqKjeIIDfm+X15R0b 5xhXjBgJX3yGIyS+qpF/o7XxyEctlJXT+ZUCBsOdaAEuP2oCSbQVh5Dejxo/EoUyJv9/n7 PSD7Y/ioq8E6lYaXyGUiq3iaK2W7s7d+pHxjNls4I7hEkL5ShGr0LTYPXUdJBQ== 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=1782840021; 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=E+6pvRZlO26mEWWORg78wFMmrCD3H8Xnjp7RcGbT1Pg=; b=ov7TGzQaU12W+19YjNu964ruVXxdvLfSjOvH12zDgKF2DlEnbTIBQWItAC3O0FkoIhGw+c lpKqa3VKe2EGGBblQLl4UAHG5zixQ58/zW14g2J6Yc4WV9Knij78OjAEiS2nuN8irVqHkd gH0eVn9b+wKJjIOZI9c3jrT2y00ak4BG4frEvSmDM09W/XrRuA9eRnGGYkuhyfda3dCWDj /1d/wRSuDnD1gwIIJCtYl6TkENuC1bGM8Y7Yrn8JerMKSpGLpg0cJtp/oQEte1EwrCLvdx 8BpzEUm7QRR7FJ/br4A9rWjS2v9yzRK1GUyxo0MJLvVAW5qlhcAEDV9/k5NA3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqVK128mmztPQ for ; Tue, 30 Jun 2026 17:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45e8d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 17:20:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 034e21efa19d - stable/15 - iconv: Fix a stack buffer overflow in _ISO2022_sputwchar() 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: 034e21efa19d065ee8921f6f23bdd32b545de166 Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 17:20:21 +0000 Message-Id: <6a43fad5.45e8d.3a29a16f@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=034e21efa19d065ee8921f6f23bdd32b545de166 commit 034e21efa19d065ee8921f6f23bdd32b545de166 Author: Mark Johnston AuthorDate: 2026-06-23 17:45:28 +0000 Commit: Mark Johnston CommitDate: 2026-06-30 17:00:27 +0000 iconv: Fix a stack buffer overflow in _ISO2022_sputwchar() In the ISO2022-CN encoding, characters may require at least seven bytes, and MB_LEN_MAX==6 is insufficient. From code inspection, _ISO2022_sputwchar() can emit 10 bytes in the worst case, so use that to size buffers. Add a regression test. Approved by: so Security: FreeBSD-SA-26:49.iconv Security: CVE-2026-58082 Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D57950 --- contrib/netbsd-tests/lib/libc/locale/t_iconv.c | 20 ++++++++++++++++++++ lib/libiconv_modules/ISO2022/citrus_iso2022.c | 8 ++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/contrib/netbsd-tests/lib/libc/locale/t_iconv.c b/contrib/netbsd-tests/lib/libc/locale/t_iconv.c index f25c061bb170..199774769827 100644 --- a/contrib/netbsd-tests/lib/libc/locale/t_iconv.c +++ b/contrib/netbsd-tests/lib/libc/locale/t_iconv.c @@ -117,6 +117,26 @@ static const struct sample { 0x82,0x42,0x79,0x65, 0x2e }, 0, 0, NULL }, + /* 馬 from CNS 11643-1 */ + [9] = { "UTF-8", 3, (const char[3]){0xe9,0xa6,0xac}, + "ISO-2022-CN", 8, + (const char[8]){0x1b,0x24,0x29,0x47,0x0e,0x58,0x6b,0x0f}, + 0, 0, NULL }, + /* 馬毦 shifting from CNS 11643-1 to CNS 11643-2 */ + [10] = { "UTF-8", 6, (const char[6]){0xe9,0xa6,0xac,0xe6,0xaf,0xa6}, + "ISO-2022-CN", 16, + (const char[16]){ + /* ESC $ ) G (shift G1 to CNS 11643 plane 1) */ + 0x1b,0x24,0x29,0x47, + 0x0e, /* GL is G1 from now on */ + 0x58,0x6b, /* 馬 */ + /* ESC $ * H (shift G2 to CNS 11643 plane 2) */ + 0x1b,0x24,0x2a,0x48, + 0x1b,0x4e, /* GL is G2 for next char */ + 0x30,0x21, /* 毦 */ + 0x0f, /* GL is G0 from now on */ + }, + 0, 0, "PR lib/59019: various iconv issues ([case 10: ISO-2022-CN to UTF-8 14/6] iconv: Illegal byte sequence (85))" }, }; #ifdef MIN diff --git a/lib/libiconv_modules/ISO2022/citrus_iso2022.c b/lib/libiconv_modules/ISO2022/citrus_iso2022.c index 126d38316df4..a28dc0be0022 100644 --- a/lib/libiconv_modules/ISO2022/citrus_iso2022.c +++ b/lib/libiconv_modules/ISO2022/citrus_iso2022.c @@ -129,7 +129,7 @@ typedef struct { #define _FUNCNAME(m) _citrus_ISO2022_##m #define _ENCODING_INFO _ISO2022EncodingInfo #define _ENCODING_STATE _ISO2022State -#define _ENCODING_MB_CUR_MAX(_ei_) MB_LEN_MAX +#define _ENCODING_MB_CUR_MAX(_ei_) 10 #define _ENCODING_IS_STATE_DEPENDENT 1 #define _STATE_NEEDS_EXPLICIT_INIT(_ps_) \ (!((_ps_)->flags & _ISO2022STATE_FLAG_INITIALIZED)) @@ -1012,7 +1012,7 @@ _ISO2022_sputwchar(_ISO2022EncodingInfo * __restrict ei, wchar_t wc, { _ISO2022Charset cs; char *p; - char tmp[MB_LEN_MAX]; + char tmp[10]; size_t len; int bit8, i = 0, target; unsigned char mask; @@ -1177,7 +1177,7 @@ _citrus_ISO2022_put_state_reset(_ISO2022EncodingInfo * __restrict ei, size_t * __restrict nresult) { char *result; - char buf[MB_LEN_MAX]; + char buf[10]; size_t len; int ret; @@ -1206,7 +1206,7 @@ _citrus_ISO2022_wcrtomb_priv(_ISO2022EncodingInfo * __restrict ei, _ISO2022State * __restrict psenc, size_t * __restrict nresult) { char *result; - char buf[MB_LEN_MAX]; + char buf[10]; size_t len; int ret;