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-14222.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-14222.patch')
-rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14222.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14222.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14222.patch new file mode 100644 index 0000000000..ee02037948 --- /dev/null +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14222.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 9cb4eb772839c5e1de2855d126bf74ff16d13382 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Niedermayer <michael@niedermayer.cc> | ||
3 | Date: Tue, 5 Sep 2017 00:16:29 +0200 | ||
4 | Subject: [PATCH] avformat/mov: Fix DoS in read_tfra() | ||
5 | |||
6 | Fixes: Missing EOF check in loop | ||
7 | No testcase | ||
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-14222 | ||
13 | Upstream-Status: Backport | ||
14 | |||
15 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
16 | --- | ||
17 | libavformat/mov.c | 7 +++++++ | ||
18 | 1 file changed, 7 insertions(+) | ||
19 | |||
20 | diff --git a/libavformat/mov.c b/libavformat/mov.c | ||
21 | index 994e9c6..2519707 100644 | ||
22 | --- a/libavformat/mov.c | ||
23 | +++ b/libavformat/mov.c | ||
24 | @@ -6094,6 +6094,13 @@ static int read_tfra(MOVContext *mov, AVIOContext *f) | ||
25 | } | ||
26 | for (i = 0; i < index->item_count; i++) { | ||
27 | int64_t time, offset; | ||
28 | + | ||
29 | + if (avio_feof(f)) { | ||
30 | + index->item_count = 0; | ||
31 | + av_freep(&index->items); | ||
32 | + return AVERROR_INVALIDDATA; | ||
33 | + } | ||
34 | + | ||
35 | if (version == 1) { | ||
36 | time = avio_rb64(f); | ||
37 | offset = avio_rb64(f); | ||
38 | -- | ||
39 | 2.1.0 | ||
40 | |||