Received: by mail.netbsd.org (Postfix, from userid 605) id 636EB84F35; Mon, 6 Aug 2018 13:25:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 550AB84ECB for ; Mon, 6 Aug 2018 13:25:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 2JLPIBa324dF for ; Mon, 6 Aug 2018 13:25:38 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 806F984DE5 for ; Mon, 6 Aug 2018 13:25:38 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 78D03FBEC; Mon, 6 Aug 2018 13:25:38 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1533561938262520" MIME-Version: 1.0 Date: Mon, 6 Aug 2018 13:25:38 +0000 From: "Soren Jacobsen" Subject: CVS commit: pkgsrc/audio/libvorbis To: pkgsrc-changes@NetBSD.org Reply-To: snj@netbsd.org X-Mailer: log_accum Message-Id: <20180806132538.78D03FBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1533561938262520 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: snj Date: Mon Aug 6 13:25:38 UTC 2018 Modified Files: pkgsrc/audio/libvorbis: Makefile distinfo Added Files: pkgsrc/audio/libvorbis/patches: patch-lib_psy.c patch-lib_vorbisenc.c Log Message: audio/libvorbis: Fix CVE-2017-14160, CVE-2018-10392, and CVE-2018-10393. Bump PKGREVISION to 1. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 pkgsrc/audio/libvorbis/Makefile cvs rdiff -u -r1.26 -r1.27 pkgsrc/audio/libvorbis/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/audio/libvorbis/patches/patch-lib_psy.c \ pkgsrc/audio/libvorbis/patches/patch-lib_vorbisenc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1533561938262520 Content-Disposition: inline Content-Length: 3173 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/audio/libvorbis/Makefile diff -u pkgsrc/audio/libvorbis/Makefile:1.61 pkgsrc/audio/libvorbis/Makefile:1.62 --- pkgsrc/audio/libvorbis/Makefile:1.61 Fri Mar 16 20:37:10 2018 +++ pkgsrc/audio/libvorbis/Makefile Mon Aug 6 13:25:38 2018 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.61 2018/03/16 20:37:10 maya Exp $ +# $NetBSD: Makefile,v 1.62 2018/08/06 13:25:38 snj Exp $ DISTNAME= libvorbis-1.3.6 +PKGREVISION= 1 CATEGORIES= devel audio MASTER_SITES= http://downloads.xiph.org/releases/vorbis/ EXTRACT_SUFX= .tar.xz Index: pkgsrc/audio/libvorbis/distinfo diff -u pkgsrc/audio/libvorbis/distinfo:1.26 pkgsrc/audio/libvorbis/distinfo:1.27 --- pkgsrc/audio/libvorbis/distinfo:1.26 Fri Mar 16 20:23:53 2018 +++ pkgsrc/audio/libvorbis/distinfo Mon Aug 6 13:25:38 2018 @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.26 2018/03/16 20:23:53 maya Exp $ +$NetBSD: distinfo,v 1.27 2018/08/06 13:25:38 snj Exp $ SHA1 (libvorbis-1.3.6.tar.xz) = 237e3d1c66452734fd9b32f494f44238b4f0185e RMD160 (libvorbis-1.3.6.tar.xz) = 80213c5a1506438a342588ae58097a1590b6657c SHA512 (libvorbis-1.3.6.tar.xz) = a5d990bb88db2501b16f8eaee9f2ecb599cefd7dab2134d16538d8905263a972157c7671867848c2a8a358bf5e5dbc7721205ece001032482f168be7bda4f132 Size (libvorbis-1.3.6.tar.xz) = 1195388 bytes +SHA1 (patch-lib_psy.c) = acbc6fd4e4e7710a05b6342c10270f085214a84f +SHA1 (patch-lib_vorbisenc.c) = e65377b441c71e75e86064292dccfb86acf298b2 Added files: Index: pkgsrc/audio/libvorbis/patches/patch-lib_psy.c diff -u /dev/null pkgsrc/audio/libvorbis/patches/patch-lib_psy.c:1.1 --- /dev/null Mon Aug 6 13:25:38 2018 +++ pkgsrc/audio/libvorbis/patches/patch-lib_psy.c Mon Aug 6 13:25:38 2018 @@ -0,0 +1,19 @@ +$NetBSD: patch-lib_psy.c,v 1.1 2018/08/06 13:25:38 snj Exp $ + +CVE-2017-14160: fix bounds check on very low sample rates. + +https://github.com/xiph/vorbis/commit/018ca26dece618457dd13585cad52941193c4a25#diff-3b415297c1f1559ee10baa1284561e46 + +--- lib/psy.c.orig 2018-08-06 06:10:59.234730587 -0700 ++++ lib/psy.c 2018-08-06 06:13:28.935699414 -0700 +@@ -602,8 +602,9 @@ static void bark_noise_hybridmp(int n,co + 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]; Index: pkgsrc/audio/libvorbis/patches/patch-lib_vorbisenc.c diff -u /dev/null pkgsrc/audio/libvorbis/patches/patch-lib_vorbisenc.c:1.1 --- /dev/null Mon Aug 6 13:25:38 2018 +++ pkgsrc/audio/libvorbis/patches/patch-lib_vorbisenc.c Mon Aug 6 13:25:38 2018 @@ -0,0 +1,14 @@ +$NetBSD: patch-lib_vorbisenc.c,v 1.1 2018/08/06 13:25:38 snj Exp $ + +https://gitlab.xiph.org/xiph/vorbis/issues/2335 + +--- lib/vorbisenc.c.orig 2018-08-06 06:17:42.209959046 -0700 ++++ lib/vorbisenc.c 2018-08-06 06:18:01.425700460 -0700 +@@ -684,6 +684,7 @@ int vorbis_encode_setup_init(vorbis_info + 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 */ --_----------=_1533561938262520--