From owner-svn-src-all@freebsd.org Tue May 12 16:54:40 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8C4262F4898; Tue, 12 May 2020 16:54: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 49M3nD3DrGz4TsP; Tue, 12 May 2020 16:54: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 51276B2CC; Tue, 12 May 2020 16:54: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 04CGseXl063737; Tue, 12 May 2020 16:54:40 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04CGsdi3063734; Tue, 12 May 2020 16:54:39 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202005121654.04CGsdi3063734@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Tue, 12 May 2020 16:54:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r360974 - in releng: 11.3/sys/netinet/libalias 11.4/sys/netinet/libalias 12.1/sys/netinet/libalias X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in releng: 11.3/sys/netinet/libalias 11.4/sys/netinet/libalias 12.1/sys/netinet/libalias X-SVN-Commit-Revision: 360974 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 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: Tue, 12 May 2020 16:54:40 -0000 Author: gordon Date: Tue May 12 16:54:39 2020 New Revision: 360974 URL: https://svnweb.freebsd.org/changeset/base/360974 Log: Fix memory disclosure vulnerability in libalias. Approved by: so Approved by: re (implicit) Security: FreeBSD-SA-20:13.libalias Security: CVE-2020-7455 Modified: releng/11.3/sys/netinet/libalias/alias_ftp.c releng/11.4/sys/netinet/libalias/alias_ftp.c releng/12.1/sys/netinet/libalias/alias_ftp.c Modified: releng/11.3/sys/netinet/libalias/alias_ftp.c ============================================================================== --- releng/11.3/sys/netinet/libalias/alias_ftp.c Tue May 12 16:52:08 2020 (r360973) +++ releng/11.3/sys/netinet/libalias/alias_ftp.c Tue May 12 16:54:39 2020 (r360974) @@ -752,7 +752,8 @@ NewFtpMessage(struct libalias *la, struct ip *pip, { u_short new_len; - new_len = htons(hlen + slen); + new_len = htons(hlen + + MIN(slen, maxpacketsize - hlen)); DifferentialChecksum(&pip->ip_sum, &new_len, &pip->ip_len, Modified: releng/11.4/sys/netinet/libalias/alias_ftp.c ============================================================================== --- releng/11.4/sys/netinet/libalias/alias_ftp.c Tue May 12 16:52:08 2020 (r360973) +++ releng/11.4/sys/netinet/libalias/alias_ftp.c Tue May 12 16:54:39 2020 (r360974) @@ -752,7 +752,8 @@ NewFtpMessage(struct libalias *la, struct ip *pip, { u_short new_len; - new_len = htons(hlen + slen); + new_len = htons(hlen + + MIN(slen, maxpacketsize - hlen)); DifferentialChecksum(&pip->ip_sum, &new_len, &pip->ip_len, Modified: releng/12.1/sys/netinet/libalias/alias_ftp.c ============================================================================== --- releng/12.1/sys/netinet/libalias/alias_ftp.c Tue May 12 16:52:08 2020 (r360973) +++ releng/12.1/sys/netinet/libalias/alias_ftp.c Tue May 12 16:54:39 2020 (r360974) @@ -754,7 +754,8 @@ NewFtpMessage(struct libalias *la, struct ip *pip, { u_short new_len; - new_len = htons(hlen + slen); + new_len = htons(hlen + + MIN(slen, maxpacketsize - hlen)); DifferentialChecksum(&pip->ip_sum, &new_len, &pip->ip_len,