diff options
author | Khairul Rohaizzat Jamaluddin <khairul.rohaizzat.jamaluddin@intel.com> | 2021-01-12 17:37:31 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-18 23:51:07 +0000 |
commit | c6381a506f970e2a429995e951d1f7c91df0e5c8 (patch) | |
tree | dd561c65bdc7053721c268a12e297c8da9573e0a /meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.1.bb | |
parent | c804eb79c134c2d175be087e090c81e5013c6488 (diff) | |
download | poky-c6381a506f970e2a429995e951d1f7c91df0e5c8.tar.gz |
ffmpeg: Fix CVE-2020-35964, CVE-2020-35965
Backport the CVE patches from upstream:
https://github.com/FFmpeg/FFmpeg/commit/27a99e2c7d450fef15594671eef4465c8a166bd7
https://github.com/FFmpeg/FFmpeg/commit/3e5959b3457f7f1856d997261e6ac672bba49e8b
CVE:
CVE-2020-35964
CVE-2020-35965
(From OE-Core rev: efe5a17b8ffca9f8a0f4d4b75cd3383f2491017d)
Signed-off-by: Khairul Rohaizzat Jamaluddin <khairul.rohaizzat.jamaluddin@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 526ee4ca2c493de1ac494b69e5ce9a9e55835c3a)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.1.bb')
-rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.1.bb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.1.bb index 37647e8ec5..f902b08811 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.1.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.1.bb | |||
@@ -26,6 +26,8 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | |||
26 | SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ | 26 | SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ |
27 | file://mips64_cpu_detection.patch \ | 27 | file://mips64_cpu_detection.patch \ |
28 | file://0001-libavutil-include-assembly-with-full-path-from-sourc.patch \ | 28 | file://0001-libavutil-include-assembly-with-full-path-from-sourc.patch \ |
29 | file://CVE-2020-35964.patch \ | ||
30 | file://CVE-2020-35965.patch \ | ||
29 | " | 31 | " |
30 | SRC_URI[sha256sum] = "ad009240d46e307b4e03a213a0f49c11b650e445b1f8be0dda2a9212b34d2ffb" | 32 | SRC_URI[sha256sum] = "ad009240d46e307b4e03a213a0f49c11b650e445b1f8be0dda2a9212b34d2ffb" |
31 | 33 | ||