diff options
| author |   Mingli Yu <Mingli.Yu@windriver.com> | 2018-09-06 17:33:28 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-06 23:43:34 +0100 |
| commit | 23393330a599403085437cb62169bb3a2375c07a (patch) | |
| tree | 70fef7288a88e304acb0b1f648a25ce54fd9d1ce /meta/recipes-multimedia | |
| parent | f017715120b67ff02f56ed5db131436ee62aeffb (diff) | |
| download | openembedded-core-23393330a599403085437cb62169bb3a2375c07a.tar.gz | |
ffmpeg: Fix CVE-2018-15822
Fixes: Assertion failure
Fixes: assert_flvenc.c:941_1.swf
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
| -rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2018-15822.patch | 37 | ||||
| -rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.2.bb | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2018-15822.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2018-15822.patch new file mode 100644 index 0000000000..7d5868a72a --- /dev/null +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2018-15822.patch @@ -0,0 +1,37 @@ +From 6b67d7f05918f7a1ee8fc6ff21355d7e8736aa10 Mon Sep 17 00:00:00 2001 +From: Michael Niedermayer <michael@niedermayer.cc> +Date: Sat, 28 Jul 2018 15:03:50 +0200 +Subject: [PATCH] avformat/flvenc: Check audio packet size + +Fixes: Assertion failure +Fixes: assert_flvenc.c:941_1.swf + +Upstream-Status: Backport [https://github.com/FFmpeg/FFmpeg/commit/6b67d7f05918f7a1ee8fc6ff21355d7e8736aa10] +CVE: CVE-2018-15822 + +Found-by: #CHEN HONGXU# <HCHEN017@e.ntu.edu.sg> +Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> +Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> +--- + libavformat/flvenc.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c +index 1c552a3e6b..e4863f1fc7 100644 +--- a/libavformat/flvenc.c ++++ b/libavformat/flvenc.c +@@ -883,6 +883,11 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) + int flags = -1, flags_size, ret; + int64_t cur_offset = avio_tell(pb); + ++ if (par->codec_type == AVMEDIA_TYPE_AUDIO && !pkt->size) { ++ av_log(s, AV_LOG_WARNING, "Empty audio Packet\n"); ++ return AVERROR(EINVAL); ++ } ++ + if (par->codec_id == AV_CODEC_ID_VP6F || par->codec_id == AV_CODEC_ID_VP6A || + par->codec_id == AV_CODEC_ID_VP6 || par->codec_id == AV_CODEC_ID_AAC) + flags_size = 2; +-- +2.17.1 + diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.2.bb index 57731e81e6..74c8e6692f 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.2.bb @@ -25,6 +25,7 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ file://mips64_cpu_detection.patch \ + file://CVE-2018-15822.patch \ " SRC_URI[md5sum] = "ae0bfdf809306a212b4f0e6eb8d1c75e" SRC_URI[sha256sum] = "a95c0cc9eb990e94031d2183f2e6e444cc61c99f6f182d1575c433d62afb2f97" |