From owner-svn-src-all@freebsd.org Wed Jul 3 00:00:40 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9DAC815E0C38; Wed, 3 Jul 2019 00:00:40 +0000 (UTC) (envelope-from gordon@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 415C8756A1; Wed, 3 Jul 2019 00:00:40 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1B5203BE6; Wed, 3 Jul 2019 00:00:40 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6300deU045932; Wed, 3 Jul 2019 00:00:39 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6300dUD045930; Wed, 3 Jul 2019 00:00:39 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201907030000.x6300dUD045930@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Wed, 3 Jul 2019 00:00:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r349621 - in releng: 11.2/lib/libc/iconv 11.3/lib/libc/iconv 12.0/lib/libc/iconv X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in releng: 11.2/lib/libc/iconv 11.3/lib/libc/iconv 12.0/lib/libc/iconv X-SVN-Commit-Revision: 349621 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 415C8756A1 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.955,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jul 2019 00:00:40 -0000 Author: gordon Date: Wed Jul 3 00:00:39 2019 New Revision: 349621 URL: https://svnweb.freebsd.org/changeset/base/349621 Log: Fix iconv buffer overflow. Approved by: so Approved by: re (implicit) Security: FreeBSD-SA-19:09.iconv Modified: releng/11.2/lib/libc/iconv/citrus_none.c releng/11.3/lib/libc/iconv/citrus_none.c releng/12.0/lib/libc/iconv/citrus_none.c Modified: releng/11.2/lib/libc/iconv/citrus_none.c ============================================================================== --- releng/11.2/lib/libc/iconv/citrus_none.c Tue Jul 2 23:59:45 2019 (r349620) +++ releng/11.2/lib/libc/iconv/citrus_none.c Wed Jul 3 00:00:39 2019 (r349621) @@ -142,7 +142,7 @@ _citrus_NONE_stdenc_cstomb(struct _citrus_stdenc * __r s[2] = (char)(idx >> 16); *nresult = 3; } else { - if (n < 3) { + if (n < 4) { *nresult = (size_t)-1; return (E2BIG); } Modified: releng/11.3/lib/libc/iconv/citrus_none.c ============================================================================== --- releng/11.3/lib/libc/iconv/citrus_none.c Tue Jul 2 23:59:45 2019 (r349620) +++ releng/11.3/lib/libc/iconv/citrus_none.c Wed Jul 3 00:00:39 2019 (r349621) @@ -142,7 +142,7 @@ _citrus_NONE_stdenc_cstomb(struct _citrus_stdenc * __r s[2] = (char)(idx >> 16); *nresult = 3; } else { - if (n < 3) { + if (n < 4) { *nresult = (size_t)-1; return (E2BIG); } Modified: releng/12.0/lib/libc/iconv/citrus_none.c ============================================================================== --- releng/12.0/lib/libc/iconv/citrus_none.c Tue Jul 2 23:59:45 2019 (r349620) +++ releng/12.0/lib/libc/iconv/citrus_none.c Wed Jul 3 00:00:39 2019 (r349621) @@ -144,7 +144,7 @@ _citrus_NONE_stdenc_cstomb(struct _citrus_stdenc * __r s[2] = (char)(idx >> 16); *nresult = 3; } else { - if (n < 3) { + if (n < 4) { *nresult = (size_t)-1; return (E2BIG); }