From owner-svn-ports-all@freebsd.org Sun Jun 28 21:52:03 2020 Return-Path: Delivered-To: svn-ports-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 83152356D96; Sun, 28 Jun 2020 21:52:03 +0000 (UTC) (envelope-from naddy@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49w48g2txXz3fXW; Sun, 28 Jun 2020 21:52:03 +0000 (UTC) (envelope-from naddy@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 46AA71CE2A; Sun, 28 Jun 2020 21:52:03 +0000 (UTC) (envelope-from naddy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05SLq3ov052802; Sun, 28 Jun 2020 21:52:03 GMT (envelope-from naddy@FreeBSD.org) Received: (from naddy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05SLq2dK052799; Sun, 28 Jun 2020 21:52:02 GMT (envelope-from naddy@FreeBSD.org) Message-Id: <202006282152.05SLq2dK052799@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: naddy set sender to naddy@FreeBSD.org using -f From: Christian Weisgerber Date: Sun, 28 Jun 2020 21:52:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r540732 - in head/audio/libvorbis: . files X-SVN-Group: ports-head X-SVN-Commit-Author: naddy X-SVN-Commit-Paths: in head/audio/libvorbis: . files X-SVN-Commit-Revision: 540732 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Jun 2020 21:52:03 -0000 Author: naddy Date: Sun Jun 28 21:52:02 2020 New Revision: 540732 URL: https://svnweb.freebsd.org/changeset/ports/540732 Log: Pick fixes for two security vulnerabilities from upstream repository: CVE-2017-14160: Fix bounds check on very low sample rates. CVE-2018-10392: Sanity check number of channels in setup. These were committed upstream two years ago, but there has been no release since. Reported by: T.J. Townsend Security: 4200d5f5-b985-11ea-b08a-f8b156b6dcc8 Added: head/audio/libvorbis/files/patch-lib_psy.c (contents, props changed) head/audio/libvorbis/files/patch-lib_vorbisenc.c (contents, props changed) Modified: head/audio/libvorbis/Makefile Modified: head/audio/libvorbis/Makefile ============================================================================== --- head/audio/libvorbis/Makefile Sun Jun 28 21:47:34 2020 (r540731) +++ head/audio/libvorbis/Makefile Sun Jun 28 21:52:02 2020 (r540732) @@ -3,6 +3,7 @@ PORTNAME= libvorbis PORTVERSION= 1.3.6 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= audio MASTER_SITES= https://downloads.xiph.org/releases/vorbis/ \ Added: head/audio/libvorbis/files/patch-lib_psy.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/libvorbis/files/patch-lib_psy.c Sun Jun 28 21:52:02 2020 (r540732) @@ -0,0 +1,15 @@ +CVE-2017-14160: fix bounds check on very low sample rates. +https://gitlab.xiph.org/xiph/vorbis/-/commit/018ca26dece618457dd13585cad52941193c4a25 +--- lib/psy.c.orig 2020-06-28 19:37:27 UTC ++++ lib/psy.c +@@ -602,8 +602,9 @@ static void bark_noise_hybridmp(int n,const long *b, + for (i = 0, x = 0.f;; i++, x += 1.f) { + + lo = b[i] >> 16; +- if( lo>=0 ) break; + hi = b[i] & 0xffff; ++ if( lo>=0 ) break; ++ if( hi>=n ) break; + + tN = N[hi] + N[-lo]; + tX = X[hi] - X[-lo]; Added: head/audio/libvorbis/files/patch-lib_vorbisenc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/libvorbis/files/patch-lib_vorbisenc.c Sun Jun 28 21:52:02 2020 (r540732) @@ -0,0 +1,12 @@ +CVE-2018-10392: Sanity check number of channels in setup. +https://gitlab.xiph.org/xiph/vorbis/-/commit/112d3bd0aaacad51305e1464d4b381dabad0e88b +--- lib/vorbisenc.c.orig 2020-06-28 19:38:54 UTC ++++ lib/vorbisenc.c +@@ -684,6 +684,7 @@ int vorbis_encode_setup_init(vorbis_info *vi){ + highlevel_encode_setup *hi=&ci->hi; + + if(ci==NULL)return(OV_EINVAL); ++ if(vi->channels<1||vi->channels>255)return(OV_EINVAL); + if(!hi->impulse_block_p)i0=1; + + /* too low/high an ATH floater is nonsensical, but doesn't break anything */