| From 4f05e2e2dc1a89f38cd9f0960a6561083d714f1e Mon Sep 17 00:00:00 2001 |
| From: Michael Niedermayer <michael@niedermayer.cc> |
| 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 <michael@niedermayer.cc> |
| |
| CVE: CVE-2017-14055 |
| Upstream-Status: Backport |
| |
| Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| --- |
| 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 |
| |