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-06 12:03:31 +0100 |
| commit | 13862938a6a7a938f8d781655ceaf78a81b57549 (patch) | |
| tree | 6d1d47ecb11dfabd917d91918dbf4f8a9dc4d245 /meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14223.patch | |
| parent | cc9d855660db27e82d1b37ab5d1820c556827635 (diff) | |
| download | openembedded-core-contrib-13862938a6a7a938f8d781655ceaf78a81b57549.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
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14223.patch')
| -rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14223.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14223.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14223.patch new file mode 100644 index 0000000000..d1fef6b144 --- /dev/null +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2017-14223.patch @@ -0,0 +1,38 @@ +From afc9c683ed9db01edb357bc8c19edad4282b3a97 Mon Sep 17 00:00:00 2001 +From: Michael Niedermayer <michael@niedermayer.cc> +Date: Tue, 5 Sep 2017 00:16:29 +0200 +Subject: [PATCH] avformat/asfdec: Fix DoS in asf_build_simple_index() + +Fixes: Missing EOF check in loop +No testcase + +Found-by: Xiaohei and Wangchu from Alibaba Security Team +Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> + +CVE: CVE-2017-14223 +Upstream-Status: Backport + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + libavformat/asfdec_f.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c +index f3acbae..cc648b9 100644 +--- a/libavformat/asfdec_f.c ++++ b/libavformat/asfdec_f.c +@@ -1610,6 +1610,11 @@ static int asf_build_simple_index(AVFormatContext *s, int stream_index) + int64_t pos = s->internal->data_offset + s->packet_size * (int64_t)pktnum; + int64_t index_pts = FFMAX(av_rescale(itime, i, 10000) - asf->hdr.preroll, 0); + ++ if (avio_feof(s->pb)) { ++ ret = AVERROR_INVALIDDATA; ++ goto end; ++ } ++ + if (pos != last_pos) { + av_log(s, AV_LOG_DEBUG, "pktnum:%d, pktct:%d pts: %"PRId64"\n", + pktnum, pktct, index_pts); +-- +2.1.0 + |