From 071cd6feb1d47001c7c465e7caea6106ee1dcb4f Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Tue, 22 May 2018 18:30:09 +0300 Subject: libvorbis: 1.3.5 -> 1.3.6 Rebased 0001-configure-Check-for-clang.patch. Removed the backported CVE patches. License-Update: copyright years refreshed (From OE-Core rev: d536c0a0e400c27fd7954402195698e2c639338a) Signed-off-by: Tanu Kaskinen Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../libvorbis/libvorbis/CVE-2017-14633.patch | 42 ---------------------- 1 file changed, 42 deletions(-) delete mode 100644 meta/recipes-multimedia/libvorbis/libvorbis/CVE-2017-14633.patch (limited to 'meta/recipes-multimedia/libvorbis/libvorbis/CVE-2017-14633.patch') diff --git a/meta/recipes-multimedia/libvorbis/libvorbis/CVE-2017-14633.patch b/meta/recipes-multimedia/libvorbis/libvorbis/CVE-2017-14633.patch deleted file mode 100644 index 9c9e688d43..0000000000 --- a/meta/recipes-multimedia/libvorbis/libvorbis/CVE-2017-14633.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 07eda55f336e5c44dfc0e4a1e21628faed7255fa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Guido=20G=C3=BCnther?= -Date: Tue, 31 Oct 2017 18:32:46 +0100 -Subject: [PATCH] CVE-2017-14633: Don't allow for more than 256 channels - -Otherwise - - for(i=0;ichannels;i++){ - /* the encoder setup assumes that all the modes used by any - specific bitrate tweaking use the same floor */ - int submap=info->chmuxlist[i]; - -overreads later in mapping0_forward since chmuxlist is a fixed array of -256 elements max. - -Upstream-Status: Backport -CVE: CVE-2017-14633 - -Reference to upstream patch: -https://git.xiph.org/?p=vorbis.git;a=commitdiff;h=667ceb4aab60c1f74060143bb24e5f427b3cce5f - -Signed-off-by: Tanu Kaskinen ---- - lib/info.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/info.c b/lib/info.c -index e447a0c..81b7557 100644 ---- a/lib/info.c -+++ b/lib/info.c -@@ -583,7 +583,7 @@ int vorbis_analysis_headerout(vorbis_dsp_state *v, - oggpack_buffer opb; - private_state *b=v->backend_state; - -- if(!b||vi->channels<=0){ -+ if(!b||vi->channels<=0||vi->channels>256){ - ret=OV_EFAULT; - goto err_out; - } --- -2.16.2 - -- cgit v1.2.3-54-g00ecf