aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2018-10-06 20:14:35 +0200
committerLeonardo Arena <rnalrd@alpinelinux.org>2019-02-08 08:52:24 +0000
commit236e230cd6246358743fd908f865e00da82d8eba (patch)
treeea1cc3d674cbba0a061b1c6949fcd0fc6f03d46e
parent5f50083061f070c58be7e24227944fc3c2aa1294 (diff)
downloadaports-236e230cd6246358743fd908f865e00da82d8eba.tar.gz
aports-236e230cd6246358743fd908f865e00da82d8eba.tar.bz2
aports-236e230cd6246358743fd908f865e00da82d8eba.tar.xz
main/libvorbis: Fix CVE-2018-10393
-rw-r--r--main/libvorbis/APKBUILD8
-rw-r--r--main/libvorbis/CVE-2018-10393.patch27
2 files changed, 33 insertions, 2 deletions
diff --git a/main/libvorbis/APKBUILD b/main/libvorbis/APKBUILD
index 4f5980fa9f..09fa481006 100644
--- a/main/libvorbis/APKBUILD
+++ b/main/libvorbis/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libvorbis
pkgver=1.3.6
-pkgrel=1
+pkgrel=2
pkgdesc="Vorbis codec library"
url="https://xiph.org/vorbis"
arch="all"
@@ -11,10 +11,13 @@ makedepends="libogg-dev"
source="http://downloads.xiph.org/releases/vorbis/$pkgname-$pkgver.tar.xz
CVE-2017-14160.patch
CVE-2018-10392.patch
+ CVE-2018-10393.patch
"
builddir="$srcdir/$pkgname-$pkgver"
# secfixes:
+# 1.3.6-r2:
+# - CVE-2018-10393
# 1.3.6-r1:
# - CVE-2018-10392
# 1.3.6-r0:
@@ -53,4 +56,5 @@ package() {
sha512sums="a5d990bb88db2501b16f8eaee9f2ecb599cefd7dab2134d16538d8905263a972157c7671867848c2a8a358bf5e5dbc7721205ece001032482f168be7bda4f132 libvorbis-1.3.6.tar.xz
4c2f7be947f2159ae47175cba89950c7b7d357b37a20d54382e4fbecd8c268b148e6cb86cb148945c7b68bbe8b14f466e910b35b80903ab51f1b02cfccf5806e CVE-2017-14160.patch
-a60d45144882bc72c3f4937a34baa5e2bda80a3a858b858637fee508755349b616690519e013ff6aafa7e8ff85fd1d0687a3e748b0e8bce25df1abeece97dc36 CVE-2018-10392.patch"
+a60d45144882bc72c3f4937a34baa5e2bda80a3a858b858637fee508755349b616690519e013ff6aafa7e8ff85fd1d0687a3e748b0e8bce25df1abeece97dc36 CVE-2018-10392.patch
+aaa8c09458ad20d45392c99781130ba815f839484b65c61e404198bae570e12401c2cf612f9c4f0b3932cc9e5eac0b066d515950425afa6eb2d6db7cc67731a6 CVE-2018-10393.patch"
diff --git a/main/libvorbis/CVE-2018-10393.patch b/main/libvorbis/CVE-2018-10393.patch
new file mode 100644
index 0000000000..c61247a508
--- /dev/null
+++ b/main/libvorbis/CVE-2018-10393.patch
@@ -0,0 +1,27 @@
+From 018ca26dece618457dd13585cad52941193c4a25 Mon Sep 17 00:00:00 2001
+From: Thomas Daede <daede003@umn.edu>
+Date: Wed, 9 May 2018 14:56:59 -0700
+Subject: [PATCH] CVE-2017-14160: fix bounds check on very low sample rates.
+
+---
+ lib/psy.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/psy.c b/lib/psy.c
+index 422c6f1e..13101230 100644
+--- a/lib/psy.c
++++ b/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];
+--
+2.18.0
+