diff options
author | Tony Tascioglu <tony.tascioglu@windriver.com> | 2021-08-20 14:31:57 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-26 08:32:13 +0100 |
commit | 82c08662c3071e07de107c7be9aa304a1fad0cd6 (patch) | |
tree | 1a91135f721a4a489aa9e746e723915081942a70 | |
parent | ba76476caef923204d95640ec38c13ba3f2b599b (diff) | |
download | poky-82c08662c3071e07de107c7be9aa304a1fad0cd6.tar.gz |
ffmpeg: fix CVE-2020-22019 and CVE-2020-22033
avfilter/vf_vmafmotion: Check dimensions
Fixes: out of array access
Fixes: Ticket8241
Fixes: Ticket8246
Fixes: CVE-2020-22019
Fixes: CVE-2020-22033
(From OE-Core rev: 7423421005816ab75ff0a08813054f7e03075cd2)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
CVE: CVE-2020-22033
CVE: CVE-2020-22019
Upstream-Status: Backport [82ad1b76751bcfad5005440db48c46a4de5d6f02]
Signed-off-by: Tony Tascioglu <tony.tascioglu@windriver.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg/fix-CVE-2020-22033-CVE-2020-22019.patch | 39 | ||||
-rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/fix-CVE-2020-22033-CVE-2020-22019.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/fix-CVE-2020-22033-CVE-2020-22019.patch new file mode 100644 index 0000000000..e98ddaaede --- /dev/null +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/fix-CVE-2020-22033-CVE-2020-22019.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 2f3bf456fa641edf154a99c4586d7bf52c02a495 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Niedermayer <michael@niedermayer.cc> | ||
3 | Date: Sat, 29 May 2021 09:58:31 +0200 | ||
4 | Subject: [PATCH 5/5] avfilter/vf_vmafmotion: Check dimensions | ||
5 | |||
6 | Fixes: out of array access | ||
7 | Fixes: Ticket8241 | ||
8 | Fixes: Ticket8246 | ||
9 | Fixes: CVE-2020-22019 | ||
10 | Fixes: CVE-2020-22033 | ||
11 | |||
12 | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> | ||
13 | |||
14 | CVE: CVE-2020-22033 | ||
15 | CVE: CVE-2020-22019 | ||
16 | Upstream-Status: Backport [82ad1b76751bcfad5005440db48c46a4de5d6f02] | ||
17 | |||
18 | Signed-off-by: Tony Tascioglu <tony.tascioglu@windriver.com> | ||
19 | --- | ||
20 | libavfilter/vf_vmafmotion.c | 3 +++ | ||
21 | 1 file changed, 3 insertions(+) | ||
22 | |||
23 | diff --git a/libavfilter/vf_vmafmotion.c b/libavfilter/vf_vmafmotion.c | ||
24 | index 88d0b35095..0730147e7d 100644 | ||
25 | --- a/libavfilter/vf_vmafmotion.c | ||
26 | +++ b/libavfilter/vf_vmafmotion.c | ||
27 | @@ -238,6 +238,9 @@ int ff_vmafmotion_init(VMAFMotionData *s, | ||
28 | int i; | ||
29 | const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt); | ||
30 | |||
31 | + if (w < 3 || h < 3) | ||
32 | + return AVERROR(EINVAL); | ||
33 | + | ||
34 | s->width = w; | ||
35 | s->height = h; | ||
36 | s->stride = FFALIGN(w * sizeof(uint16_t), 32); | ||
37 | -- | ||
38 | 2.32.0 | ||
39 | |||
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb index e68589d4c3..0a49493abd 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb | |||
@@ -30,6 +30,7 @@ SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ | |||
30 | file://fix-CVE-2020-20453.patch \ | 30 | file://fix-CVE-2020-20453.patch \ |
31 | file://fix-CVE-2020-22015.patch \ | 31 | file://fix-CVE-2020-22015.patch \ |
32 | file://fix-CVE-2020-22021.patch \ | 32 | file://fix-CVE-2020-22021.patch \ |
33 | file://fix-CVE-2020-22033-CVE-2020-22019.patch \ | ||
33 | " | 34 | " |
34 | SRC_URI[sha256sum] = "46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb" | 35 | SRC_URI[sha256sum] = "46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb" |
35 | 36 | ||