From nobody Tue Jun 30 17:19:17 2026 X-Original-To: dev-commits-src-main@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 4gqVHq08xMz6jXZP for ; Tue, 30 Jun 2026 17:19:19 +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 4gqVHp1Ngmz3ngk for ; Tue, 30 Jun 2026 17:19:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782839958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tdgJpDO0ysJABUWTGtyfegkkar0wNuD4/pnuJQiKYnY=; b=WDYDcVsK9Qkv2pzW3Syrpp8UgenbVKeRJO7ODT4cDM5AwIqnpkv+5NV5ub9/To15WMXavC 3FMBHoFM+JKn9BWE+fnqkid0MKvS/0k9YYb6/8O4sn0A5GL0fkqpXUDmH86j6r1BGVzXDe PVgs702W5CTht9BleGvHkTEobXhFwsg4HDwPKWAo6hpIGm5sLrQRsqKs6Bd/oynUdOlPmd 1kcaa0oE0FbWBKDnacPp6zf2l9y7mDwH+XF7k6ffXKmNi8tQ1nLBLQ4Y1QhbqSsiSqzlxR p8l2nTbRofJCmOkrjBMupbfZQ7BAFYEFhxPiGH+kCSXktVTM3n0btrWtbcpkiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782839958; a=rsa-sha256; cv=none; b=eLntevFOi2lGTA5+EpekUnKnw73BN3ytJHU317GRnmbevOBoBQz3YAZluB3g/bT7yAoVko aqVM67vYhe/F55XO7ps9vG7IRvcYX0mqe0G7thpoSmFABJzZ3lBKgrXF5jqy+Aw5qSE0a+ +18BOUYJeUOxRfb5cVJOvF7B6SJfF4xvT0rEboH7drS8Y25S/4JIvcBdOTJdrMQdcK3bbL BXMoPRGfMc/ECCN+Ko9pVi5k/VrgYbZRTvM4CYepSknYse/TcGc5Oqj0SzmQp+Psq59+WW e9o4iCEuca4dFNWjIgyDARfylex/yYqr9k0FauLVRed52rPoMATnC+bOSXp6sw== 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=1782839958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tdgJpDO0ysJABUWTGtyfegkkar0wNuD4/pnuJQiKYnY=; b=hoKJwW4BGYJ35x/RXSMJzTUK8hZwvHc1mosvxIih8dcZxVEaNZ9oie4HrTizrtPZiQmoxV DGBImBe1WKHIwT/YFsQW+y13dNeS3pav2jg5YcgQtF5xYUG+eQdEs0YaOmWJe+fipdoHmD yttHdz22gZKArKDHCnE/bacGcG4EZVdOdqKpanG6J+l/HgwJrKr96DC7LgDC5NvlDCO73w MB+AdfvZ8Z/66NnsLX/OiExOG4FfDYFg1dvnZBFVd8y/A5xTi2ydJCo374jXxeOJo/r7aP vnXlSkYAMf7I0GfEMr5AN092/YRLF4xNqJAV+V0MwTnvgENGoKIlGkcNZGdwng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqVHn6vcKztPF for ; Tue, 30 Jun 2026 17:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44d1e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 17:19:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Taylor R Campbell From: Mark Johnston Subject: git: a9d3259c4e50 - main - iconv(3): Fix problems in various encodings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: a9d3259c4e50da8aac100da23aa37c43055f8be2 Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 17:19:17 +0000 Message-Id: <6a43fa95.44d1e.2912c91@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a9d3259c4e50da8aac100da23aa37c43055f8be2 commit a9d3259c4e50da8aac100da23aa37c43055f8be2 Author: Taylor R Campbell AuthorDate: 2026-06-22 21:15:25 +0000 Commit: Mark Johnston CommitDate: 2026-06-30 17:00:23 +0000 iconv(3): Fix problems in various encodings Fix null pointer dereference with HZ8 encoding. Fix output buffer overrun in UTF-7, VIQR, ZW encodings. Approved by: so Security: FreeBSD-SA-26:49.iconv Security: CVE-2026-58081 Reviewed by: markj, kevans Differential Revision: https://reviews.freebsd.org/D57947 --- lib/libiconv_modules/HZ/citrus_hz.c | 2 ++ lib/libiconv_modules/UTF7/citrus_utf7.c | 20 +++++++++++++++----- lib/libiconv_modules/VIQR/citrus_viqr.c | 6 +++++- lib/libiconv_modules/ZW/citrus_zw.c | 7 +++++-- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/lib/libiconv_modules/HZ/citrus_hz.c b/lib/libiconv_modules/HZ/citrus_hz.c index f12938a7dab8..db738b8f812e 100644 --- a/lib/libiconv_modules/HZ/citrus_hz.c +++ b/lib/libiconv_modules/HZ/citrus_hz.c @@ -262,6 +262,8 @@ _citrus_HZ_mbrtowc_priv(_HZEncodingInfo * __restrict ei, tail = psenc->chlen = 0; continue; } + if (graphic == NULL) + break; } else if (ch & 0x80) { if (graphic != GR(psenc->inuse)) break; diff --git a/lib/libiconv_modules/UTF7/citrus_utf7.c b/lib/libiconv_modules/UTF7/citrus_utf7.c index f924366551f1..e7c6a0862c54 100644 --- a/lib/libiconv_modules/UTF7/citrus_utf7.c +++ b/lib/libiconv_modules/UTF7/citrus_utf7.c @@ -296,7 +296,7 @@ done: static int _citrus_UTF7_utf16tomb(_UTF7EncodingInfo * __restrict ei, - char * __restrict s, size_t n __unused, uint16_t u16, + char * __restrict s, size_t n, uint16_t u16, _UTF7State * __restrict psenc, size_t * __restrict nresult) { int bits, i; @@ -336,6 +336,8 @@ _citrus_UTF7_utf16tomb(_UTF7EncodingInfo * __restrict ei, psenc->ch[psenc->chlen++] = base64[i]; } } + if (n < (size_t)psenc->chlen) + return (E2BIG); memcpy(s, psenc->ch, psenc->chlen); *nresult = psenc->chlen; psenc->chlen = 0; @@ -352,6 +354,8 @@ _citrus_UTF7_wcrtomb_priv(_UTF7EncodingInfo * __restrict ei, uint16_t u16[2]; int err, i, len; size_t nr, siz; + char buf[8], *bufp = buf; + _UTF7State psenc_save = *psenc; u32 = (uint32_t)wchar; if (u32 <= UTF16_MAX) { @@ -367,14 +371,20 @@ _citrus_UTF7_wcrtomb_priv(_UTF7EncodingInfo * __restrict ei, return (EILSEQ); } siz = 0; + if (n > sizeof(buf)) + n = sizeof(buf); for (i = 0; i < len; ++i) { - err = _citrus_UTF7_utf16tomb(ei, s, n, u16[i], psenc, &nr); - if (err != 0) - return (err); /* XXX: state has been modified */ - s += nr; + err = _citrus_UTF7_utf16tomb(ei, bufp, n, u16[i], psenc, &nr); + if (err != 0) { + *nresult = (size_t)-1; + *psenc = psenc_save; /* restore state */ + return (err); + } + bufp += nr; n -= nr; siz += nr; } + memcpy(s, buf, siz); *nresult = siz; return (0); diff --git a/lib/libiconv_modules/VIQR/citrus_viqr.c b/lib/libiconv_modules/VIQR/citrus_viqr.c index 1747c0a1705e..c1e88f188aab 100644 --- a/lib/libiconv_modules/VIQR/citrus_viqr.c +++ b/lib/libiconv_modules/VIQR/citrus_viqr.c @@ -323,7 +323,11 @@ _citrus_VIQR_wcrtomb_priv(_VIQREncodingInfo * __restrict ei, int ch = 0; switch (psenc->chlen) { - case 0: case 1: + case 0: + break; + case 1: + if (n-- < 1) + goto e2big; break; default: return (EINVAL); diff --git a/lib/libiconv_modules/ZW/citrus_zw.c b/lib/libiconv_modules/ZW/citrus_zw.c index 3c650c46d0f4..cf66581c3336 100644 --- a/lib/libiconv_modules/ZW/citrus_zw.c +++ b/lib/libiconv_modules/ZW/citrus_zw.c @@ -263,9 +263,12 @@ _citrus_ZW_wcrtomb_priv(_ZWEncodingInfo * __restrict ei __unused, ch = (unsigned char)wc; switch (psenc->charset) { case NONE: - if (ch == '\0' || ch == '\n') + if (ch == '\0' || ch == '\n') { + if (n < 1) + return (E2BIG); + n -= 1; psenc->ch[psenc->chlen++] = ch; - else { + } else { if (n < 4) return (E2BIG); n -= 4;