diff options
Diffstat (limited to 'meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14055.patch')
-rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14055.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14055.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14055.patch new file mode 100644 index 0000000000..37d0d1ab7f --- /dev/null +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14055.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 4f05e2e2dc1a89f38cd9f0960a6561083d714f1e Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Niedermayer <michael@niedermayer.cc> | ||
3 | Date: Fri, 25 Aug 2017 01:15:30 +0200 | ||
4 | Subject: [PATCH] avformat/mvdec: Fix DoS due to lack of eof check | ||
5 | |||
6 | Fixes: loop.mv | ||
7 | |||
8 | Found-by: Xiaohei and Wangchu from Alibaba Security Team | ||
9 | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> | ||
10 | |||
11 | CVE: CVE-2017-14055 | ||
12 | Upstream-Status: Backport | ||
13 | |||
14 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
15 | --- | ||
16 | libavformat/mvdec.c | 2 ++ | ||
17 | 1 file changed, 2 insertions(+) | ||
18 | |||
19 | diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c | ||
20 | index 0e12c8c..f7aa4cb 100644 | ||
21 | --- a/libavformat/mvdec.c | ||
22 | +++ b/libavformat/mvdec.c | ||
23 | @@ -342,6 +342,8 @@ static int mv_read_header(AVFormatContext *avctx) | ||
24 | uint32_t pos = avio_rb32(pb); | ||
25 | uint32_t asize = avio_rb32(pb); | ||
26 | uint32_t vsize = avio_rb32(pb); | ||
27 | + if (avio_feof(pb)) | ||
28 | + return AVERROR_INVALIDDATA; | ||
29 | avio_skip(pb, 8); | ||
30 | av_add_index_entry(ast, pos, timestamp, asize, 0, AVINDEX_KEYFRAME); | ||
31 | av_add_index_entry(vst, pos + asize, i, vsize, 0, AVINDEX_KEYFRAME); | ||
32 | -- | ||
33 | 2.1.0 | ||
34 | |||