diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2017-09-26 15:43:24 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-10-07 23:20:39 +0100 |
commit | 4435ab4a3b2acbd66910dad5c602ec71f8902386 (patch) | |
tree | 5b429173d641ea6df515dbb542ed4a0e4c6ee3e9 /meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14054.patch | |
parent | 7ea2d2fb57572a03e322810c57e73b9255de9053 (diff) | |
download | poky-4435ab4a3b2acbd66910dad5c602ec71f8902386.tar.gz |
ffmpeg: backport patches to fix 12 CVEs
Backport patches to fix the following CVEs.
CVE-2017-14054
CVE-2017-14055
CVE-2017-14056
CVE-2017-14057
CVE-2017-14058
CVE-2017-14059
CVE-2017-14169
CVE-2017-14170
CVE-2017-14171
CVE-2017-14222
CVE-2017-14223
CVE-2017-14225
(From OE-Core rev: 13862938a6a7a938f8d781655ceaf78a81b57549)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14054.patch')
-rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14054.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14054.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14054.patch new file mode 100644 index 0000000000..e8baa188a3 --- /dev/null +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14054.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 124eb202e70678539544f6268efc98131f19fa49 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?=E5=AD=99=E6=B5=A9=20and=20=E5=BC=A0=E6=B4=AA=E4=BA=AE=28?= | ||
3 | =?UTF-8?q?=E6=9C=9B=E5=88=9D=29?= <tony.sh and wangchu.zhl@alibaba-inc.com> | ||
4 | Date: Fri, 25 Aug 2017 01:15:28 +0200 | ||
5 | Subject: [PATCH] avformat/rmdec: Fix DoS due to lack of eof check | ||
6 | |||
7 | Fixes: loop.ivr | ||
8 | |||
9 | Found-by: Xiaohei and Wangchu from Alibaba Security Team | ||
10 | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> | ||
11 | |||
12 | CVE: CVE-2017-14054 | ||
13 | Upstream-Status: Backport | ||
14 | |||
15 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
16 | --- | ||
17 | libavformat/rmdec.c | 5 ++++- | ||
18 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c | ||
21 | index 178eaea..d6d7d9c 100644 | ||
22 | --- a/libavformat/rmdec.c | ||
23 | +++ b/libavformat/rmdec.c | ||
24 | @@ -1223,8 +1223,11 @@ static int ivr_read_header(AVFormatContext *s) | ||
25 | av_log(s, AV_LOG_DEBUG, "%s = '%s'\n", key, val); | ||
26 | } else if (type == 4) { | ||
27 | av_log(s, AV_LOG_DEBUG, "%s = '0x", key); | ||
28 | - for (j = 0; j < len; j++) | ||
29 | + for (j = 0; j < len; j++) { | ||
30 | + if (avio_feof(pb)) | ||
31 | + return AVERROR_INVALIDDATA; | ||
32 | av_log(s, AV_LOG_DEBUG, "%X", avio_r8(pb)); | ||
33 | + } | ||
34 | av_log(s, AV_LOG_DEBUG, "'\n"); | ||
35 | } else if (len == 4 && type == 3 && !strncmp(key, "StreamCount", tlen)) { | ||
36 | nb_streams = value = avio_rb32(pb); | ||
37 | -- | ||
38 | 2.1.0 | ||
39 | |||