diff options
author | Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> | 2018-07-28 10:20:08 +0530 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-29 15:23:50 +0100 |
commit | fb3f8f14bd80f29d22afd846df550e96027c6f58 (patch) | |
tree | d9a7a0a48fde3f451b16bfd1ac331c92a5532908 /meta/recipes-multimedia | |
parent | 6a87904a3886b61d420f0449771b83127281759e (diff) | |
download | poky-fb3f8f14bd80f29d22afd846df550e96027c6f58.tar.gz |
libvorbis: CVE-2018-10392
Sanity check number of channels in setup.
Fixes #2335.
Link: https://gitlab.xiph.org/xiph/vorbis/issues/2335
(From OE-Core rev: 10569dfa6da1f7f9f021852acf4f936b3aead16a)
Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r-- | meta/recipes-multimedia/libvorbis/libvorbis/CVE-2018-10392.patch | 29 | ||||
-rw-r--r-- | meta/recipes-multimedia/libvorbis/libvorbis_1.3.5.bb | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/libvorbis/libvorbis/CVE-2018-10392.patch b/meta/recipes-multimedia/libvorbis/libvorbis/CVE-2018-10392.patch new file mode 100644 index 0000000000..f1ef6fb9c7 --- /dev/null +++ b/meta/recipes-multimedia/libvorbis/libvorbis/CVE-2018-10392.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 112d3bd0aaacad51305e1464d4b381dabad0e88b Mon Sep 17 00:00:00 2001 | ||
2 | From: Thomas Daede <daede003@umn.edu> | ||
3 | Date: Thu, 17 May 2018 16:19:19 -0700 | ||
4 | Subject: [PATCH] Sanity check number of channels in setup. | ||
5 | |||
6 | Fixes #2335. | ||
7 | CVE: CVE-2018-10392 | ||
8 | Upstream-Status: Backport [https://gitlab.xiph.org/xiph/vorbis/commit/112d3bd0aaacad51305e1464d4b381dabad0e88b] | ||
9 | |||
10 | Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> | ||
11 | --- | ||
12 | lib/vorbisenc.c | 1 + | ||
13 | 1 file changed, 1 insertion(+) | ||
14 | |||
15 | diff --git a/lib/vorbisenc.c b/lib/vorbisenc.c | ||
16 | index 4fc7b62..64a51b5 100644 | ||
17 | --- a/lib/vorbisenc.c | ||
18 | +++ b/lib/vorbisenc.c | ||
19 | @@ -684,6 +684,7 @@ int vorbis_encode_setup_init(vorbis_info *vi){ | ||
20 | highlevel_encode_setup *hi=&ci->hi; | ||
21 | |||
22 | if(ci==NULL)return(OV_EINVAL); | ||
23 | + if(vi->channels<1||vi->channels>255)return(OV_EINVAL); | ||
24 | if(!hi->impulse_block_p)i0=1; | ||
25 | |||
26 | /* too low/high an ATH floater is nonsensical, but doesn't break anything */ | ||
27 | -- | ||
28 | 2.13.3 | ||
29 | |||
diff --git a/meta/recipes-multimedia/libvorbis/libvorbis_1.3.5.bb b/meta/recipes-multimedia/libvorbis/libvorbis_1.3.5.bb index 1a49e593a6..615b53963b 100644 --- a/meta/recipes-multimedia/libvorbis/libvorbis_1.3.5.bb +++ b/meta/recipes-multimedia/libvorbis/libvorbis_1.3.5.bb | |||
@@ -17,6 +17,7 @@ SRC_URI = "http://downloads.xiph.org/releases/vorbis/${BP}.tar.xz \ | |||
17 | file://CVE-2017-14632.patch \ | 17 | file://CVE-2017-14632.patch \ |
18 | file://CVE-2018-5146.patch \ | 18 | file://CVE-2018-5146.patch \ |
19 | file://CVE-2017-14160.patch \ | 19 | file://CVE-2017-14160.patch \ |
20 | file://CVE-2018-10392.patch \ | ||
20 | " | 21 | " |
21 | SRC_URI[md5sum] = "28cb28097c07a735d6af56e598e1c90f" | 22 | SRC_URI[md5sum] = "28cb28097c07a735d6af56e598e1c90f" |
22 | SRC_URI[sha256sum] = "54f94a9527ff0a88477be0a71c0bab09a4c3febe0ed878b24824906cd4b0e1d1" | 23 | SRC_URI[sha256sum] = "54f94a9527ff0a88477be0a71c0bab09a4c3febe0ed878b24824906cd4b0e1d1" |