diff options
Diffstat (limited to 'poky/meta/recipes-multimedia/ffmpeg')
| -rw-r--r-- | poky/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2018-15822.patch | 37 | ||||
| -rw-r--r-- | poky/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.2.bb (renamed from poky/meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.2.bb) | 15 |
2 files changed, 48 insertions, 4 deletions
diff --git a/poky/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2018-15822.patch b/poky/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2018-15822.patch new file mode 100644 index 000000000..7d5868a72 --- /dev/null +++ b/poky/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/poky/meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.2.bb b/poky/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.2.bb index 879cf7ffb..7d1af0404 100644 --- a/poky/meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.2.bb +++ b/poky/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.2.bb @@ -25,18 +25,21 @@ 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] = "cbf4ead227fcedddf54c86013705a988" -SRC_URI[sha256sum] = "2b92e9578ef8b3e49eeab229e69305f5f4cbc1fdaa22e927fc7fca18acccd740" +SRC_URI[md5sum] = "ae0bfdf809306a212b4f0e6eb8d1c75e" +SRC_URI[sha256sum] = "a95c0cc9eb990e94031d2183f2e6e444cc61c99f6f182d1575c433d62afb2f97" # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717 -ARM_INSTRUCTION_SET = "arm" +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET_armv6 = "arm" # Should be API compatible with libav (which was a fork of ffmpeg) # libpostproc was previously packaged from a separate recipe PROVIDES = "libav libpostproc" -DEPENDS = "alsa-lib zlib libogg yasm-native" +DEPENDS = "alsa-lib zlib libogg nasm-native" inherit autotools pkgconfig @@ -114,6 +117,10 @@ EXTRA_OECONF = " \ " EXTRA_OECONF_append_linux-gnux32 = " --disable-asm" +# gold crashes on x86, another solution is to --disable-asm but thats more hacky +# ld.gold: internal error in relocate_section, at ../../gold/i386.cc:3684 + +LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" do_configure() { ${S}/configure ${EXTRA_OECONF} |