Hello community,
here is the log from the commit of package libvorbis for openSUSE:Factory
checked in at 2018-06-08 23:10:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libvorbis (Old)
and /work/SRC/openSUSE:Factory/.libvorbis.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvorbis"
Fri Jun 8 23:10:29 2018 rev:51 rq:614217 version:1.3.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/libvorbis/libvorbis.changes 2018-05-06
15:00:58.138126005 +0200
+++ /work/SRC/openSUSE:Factory/.libvorbis.new/libvorbis.changes 2018-06-08
23:10:34.782649932 +0200
@@ -1,0 +2,9 @@
+Tue Jun 5 11:37:54 CEST 2018 - ti...@suse.de
+
+- Replace vorbis-CVE-2017-14160.patch with the upstream fix
+ (commit 018ca26dece6), refresh vorbis-CVE-2018-10393.patch
+- Fix the validation of channels in mapping0_forward()
+ (CVE-2018-10392, bsc#1091070):
+ vorbis-CVE-2018-10392.patch
+
+-------------------------------------------------------------------
New:
----
vorbis-CVE-2018-10392.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvorbis.spec ++++++
--- /var/tmp/diff_new_pack.O8D1I0/_old 2018-06-08 23:10:38.182527176 +0200
+++ /var/tmp/diff_new_pack.O8D1I0/_new 2018-06-08 23:10:38.206526310 +0200
@@ -30,6 +30,7 @@
Patch12: vorbis-ocloexec.patch
Patch101: vorbis-CVE-2017-14160.patch
Patch102: vorbis-CVE-2018-10393.patch
+Patch103: vorbis-CVE-2018-10392.patch
BuildRequires: libogg-devel
BuildRequires: libtool
BuildRequires: pkgconfig
@@ -120,6 +121,7 @@
%patch12
%patch101 -p1
%patch102 -p1
+%patch103 -p1
%build
# Fix optimization level
++++++ vorbis-CVE-2017-14160.patch ++++++
--- /var/tmp/diff_new_pack.O8D1I0/_old 2018-06-08 23:10:38.254524576 +0200
+++ /var/tmp/diff_new_pack.O8D1I0/_new 2018-06-08 23:10:38.254524576 +0200
@@ -1,53 +1,27 @@
-From 98a60969315dba8c1e8231f561e1551670bc80ae Mon Sep 17 00:00:00 2001
-Message-Id:
<98a60969315dba8c1e8231f561e1551670bc80ae.1511192857.git....@sigxcpu.org>
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <a...@sigxcpu.org>
-Date: Wed, 15 Nov 2017 13:12:00 +0100
-Subject: [PATCH] CVE-2017-14160: make sure we don't overflow
+From 018ca26dece618457dd13585cad52941193c4a25 Mon Sep 17 00:00:00 2001
+From: Thomas Daede <daede...@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 | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
+ lib/psy.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+diff --git a/lib/psy.c b/lib/psy.c
+index 422c6f1e412d..13101230ea3a 100644
--- a/lib/psy.c
+++ b/lib/psy.c
-@@ -599,7 +599,7 @@ static void bark_noise_hybridmp(int n,co
- XY[i] = tXY;
- }
-
-- for (i = 0, x = 0.f;; i++, x += 1.f) {
-+ for (i = 0, x = 0.f; i < n; i++, x += 1.f) {
-
- lo = b[i] >> 16;
- if( lo>=0 ) break;
-@@ -621,12 +621,11 @@ static void bark_noise_hybridmp(int n,co
- noise[i] = R - offset;
- }
-
-- for ( ;; i++, x += 1.f) {
-+ for ( ; i < n; i++, x += 1.f) {
+@@ -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(hi>=n)break;
--
- tN = N[hi] - N[lo];
- tX = X[hi] - X[lo];
- tXX = XX[hi] - XX[lo];
-@@ -651,7 +650,7 @@ static void bark_noise_hybridmp(int n,co
++ if( lo>=0 ) break;
++ if( hi>=n ) break;
- if (fixed <= 0) return;
-
-- for (i = 0, x = 0.f;; i++, x += 1.f) {
-+ for (i = 0, x = 0.f; i < n; i++, x += 1.f) {
- hi = i + fixed / 2;
- lo = hi - fixed;
- if(lo>=0)break;
-@@ -670,7 +669,7 @@ static void bark_noise_hybridmp(int n,co
-
- if (R - offset < noise[i]) noise[i] = R - offset;
- }
-- for ( ;; i++, x += 1.f) {
-+ for ( ; i < n; i++, x += 1.f) {
-
- hi = i + fixed / 2;
- lo = hi - fixed;
+ tN = N[hi] + N[-lo];
+ tX = X[hi] - X[-lo];
+--
+2.17.0
+
++++++ vorbis-CVE-2018-10392.patch ++++++
>From 112d3bd0aaacad51305e1464d4b381dabad0e88b Mon Sep 17 00:00:00 2001
From: Thomas Daede <daede...@umn.edu>
Date: Thu, 17 May 2018 16:19:19 -0700
Subject: [PATCH] Sanity check number of channels in setup.
Fixes #2335.
---
lib/vorbisenc.c | 1 +
1 file changed, 1 insertion(+)
--- a/lib/vorbisenc.c
+++ b/lib/vorbisenc.c
@@ -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 */
++++++ vorbis-CVE-2018-10393.patch ++++++
--- /var/tmp/diff_new_pack.O8D1I0/_old 2018-06-08 23:10:38.382519955 +0200
+++ /var/tmp/diff_new_pack.O8D1I0/_new 2018-06-08 23:10:38.386519811 +0200
@@ -1,27 +1,26 @@
---
- lib/psy.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ lib/psy.c | 4 ++++
+ 1 file changed, 4 insertions(+)
--- a/lib/psy.c
+++ b/lib/psy.c
-@@ -604,6 +604,7 @@ static void bark_noise_hybridmp(int n,co
- lo = b[i] >> 16;
- if( lo>=0 ) break;
+@@ -605,6 +605,7 @@ static void bark_noise_hybridmp(int n,co
hi = b[i] & 0xffff;
-+ if( hi>=n || -lo >=n ) break;
+ if( lo>=0 ) break;
+ if( hi>=n ) break;
++ if( -lo >=n ) break;
tN = N[hi] + N[-lo];
tX = X[hi] - X[-lo];
-@@ -625,7 +626,7 @@ static void bark_noise_hybridmp(int n,co
-
+@@ -627,6 +628,7 @@ static void bark_noise_hybridmp(int n,co
lo = b[i] >> 16;
hi = b[i] & 0xffff;
-- if(hi>=n)break;
-+ if( hi>=n || lo >=n ) break;
+ if(hi>=n)break;
++ if(lo >=n)break;
+
tN = N[hi] - N[lo];
tX = X[hi] - X[lo];
- tXX = XX[hi] - XX[lo];
-@@ -654,6 +655,7 @@ static void bark_noise_hybridmp(int n,co
+@@ -656,6 +658,7 @@ static void bark_noise_hybridmp(int n,co
hi = i + fixed / 2;
lo = hi - fixed;
if(lo>=0)break;
@@ -29,7 +28,7 @@
tN = N[hi] + N[-lo];
tX = X[hi] - X[-lo];
-@@ -674,6 +676,7 @@ static void bark_noise_hybridmp(int n,co
+@@ -676,6 +679,7 @@ static void bark_noise_hybridmp(int n,co
hi = i + fixed / 2;
lo = hi - fixed;
if(hi>=n)break;
