From 4435ab4a3b2acbd66910dad5c602ec71f8902386 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 26 Sep 2017 15:43:24 +0800 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../ffmpeg/ffmpeg/CVE-2017-14055.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14055.patch (limited to 'meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14055.patch') 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 @@ +From 4f05e2e2dc1a89f38cd9f0960a6561083d714f1e Mon Sep 17 00:00:00 2001 +From: Michael Niedermayer +Date: Fri, 25 Aug 2017 01:15:30 +0200 +Subject: [PATCH] avformat/mvdec: Fix DoS due to lack of eof check + +Fixes: loop.mv + +Found-by: Xiaohei and Wangchu from Alibaba Security Team +Signed-off-by: Michael Niedermayer + +CVE: CVE-2017-14055 +Upstream-Status: Backport + +Signed-off-by: Chen Qi +--- + libavformat/mvdec.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c +index 0e12c8c..f7aa4cb 100644 +--- a/libavformat/mvdec.c ++++ b/libavformat/mvdec.c +@@ -342,6 +342,8 @@ static int mv_read_header(AVFormatContext *avctx) + uint32_t pos = avio_rb32(pb); + uint32_t asize = avio_rb32(pb); + uint32_t vsize = avio_rb32(pb); ++ if (avio_feof(pb)) ++ return AVERROR_INVALIDDATA; + avio_skip(pb, 8); + av_add_index_entry(ast, pos, timestamp, asize, 0, AVINDEX_KEYFRAME); + av_add_index_entry(vst, pos + asize, i, vsize, 0, AVINDEX_KEYFRAME); +-- +2.1.0 + -- cgit v1.2.3-54-g00ecf