summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2018-03-31 05:24:26 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-05 14:13:48 (GMT)
commit4ec84083df77df017eee5738cff03c8fb4a5a216 (patch)
tree94e6d44b80e3d4a55e3d65543fda2e539f19e6aa
parent2861ecf2245b414f3694c6db186c8d5d0ba17aea (diff)
downloadpoky-4ec84083df77df017eee5738cff03c8fb4a5a216.tar.gz
libvorbis: CVE-2017-14633
In Xiph.Org libvorbis 1.3.5, an out-of-bounds array read vulnerability exists in the function mapping0_forward() in mapping0.c, which may lead to DoS when operating on a crafted audio file with vorbis_analysis(). References: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-14633 (From OE-Core rev: f398fb04549577922e6265c0969c6d6c35a11e7c) (From OE-Core rev: a7f1fa651620b98c211459e80e5d9608ce8f1866) Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/libvorbis/libvorbis/CVE-2017-14633.patch42
-rw-r--r--meta/recipes-multimedia/libvorbis/libvorbis_1.3.5.bb4
2 files changed, 45 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/libvorbis/libvorbis/CVE-2017-14633.patch b/meta/recipes-multimedia/libvorbis/libvorbis/CVE-2017-14633.patch
new file mode 100644
index 0000000..9c9e688
--- /dev/null
+++ b/meta/recipes-multimedia/libvorbis/libvorbis/CVE-2017-14633.patch
@@ -0,0 +1,42 @@
1From 07eda55f336e5c44dfc0e4a1e21628faed7255fa Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
3Date: Tue, 31 Oct 2017 18:32:46 +0100
4Subject: [PATCH] CVE-2017-14633: Don't allow for more than 256 channels
5
6Otherwise
7
8 for(i=0;i<vi->channels;i++){
9 /* the encoder setup assumes that all the modes used by any
10 specific bitrate tweaking use the same floor */
11 int submap=info->chmuxlist[i];
12
13overreads later in mapping0_forward since chmuxlist is a fixed array of
14256 elements max.
15
16Upstream-Status: Backport
17CVE: CVE-2017-14633
18
19Reference to upstream patch:
20https://git.xiph.org/?p=vorbis.git;a=commitdiff;h=667ceb4aab60c1f74060143bb24e5f427b3cce5f
21
22Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
23---
24 lib/info.c | 2 +-
25 1 file changed, 1 insertion(+), 1 deletion(-)
26
27diff --git a/lib/info.c b/lib/info.c
28index e447a0c..81b7557 100644
29--- a/lib/info.c
30+++ b/lib/info.c
31@@ -583,7 +583,7 @@ int vorbis_analysis_headerout(vorbis_dsp_state *v,
32 oggpack_buffer opb;
33 private_state *b=v->backend_state;
34
35- if(!b||vi->channels<=0){
36+ if(!b||vi->channels<=0||vi->channels>256){
37 ret=OV_EFAULT;
38 goto err_out;
39 }
40--
412.16.2
42
diff --git a/meta/recipes-multimedia/libvorbis/libvorbis_1.3.5.bb b/meta/recipes-multimedia/libvorbis/libvorbis_1.3.5.bb
index 636e0f3..75c2038 100644
--- a/meta/recipes-multimedia/libvorbis/libvorbis_1.3.5.bb
+++ b/meta/recipes-multimedia/libvorbis/libvorbis_1.3.5.bb
@@ -10,7 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7d2c487d2fc7dd3e3c7c465a5b7f6217 \
10 file://include/vorbis/vorbisenc.h;beginline=1;endline=11;md5=d1c1d138863d6315131193d4046d81cb" 10 file://include/vorbis/vorbisenc.h;beginline=1;endline=11;md5=d1c1d138863d6315131193d4046d81cb"
11DEPENDS = "libogg" 11DEPENDS = "libogg"
12 12
13SRC_URI = "http://downloads.xiph.org/releases/vorbis/${BP}.tar.xz" 13SRC_URI = "http://downloads.xiph.org/releases/vorbis/${BP}.tar.xz \
14 file://CVE-2017-14633.patch \
15 "
14SRC_URI[md5sum] = "28cb28097c07a735d6af56e598e1c90f" 16SRC_URI[md5sum] = "28cb28097c07a735d6af56e598e1c90f"
15SRC_URI[sha256sum] = "54f94a9527ff0a88477be0a71c0bab09a4c3febe0ed878b24824906cd4b0e1d1" 17SRC_URI[sha256sum] = "54f94a9527ff0a88477be0a71c0bab09a4c3febe0ed878b24824906cd4b0e1d1"
16 18