diff options
author | Bhabu Bindu <bhabu.bindu@kpit.com> | 2023-01-19 19:39:34 +0530 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-02-13 07:44:09 +0000 |
commit | e3af3f6915f7f4f2084eb37a47b115c5836f5b63 (patch) | |
tree | b5575666b05494ec209ca9ebb704331c1e459369 /meta/recipes-multimedia/ffmpeg | |
parent | 6c3fc7df68b7e96f84c9ca24e9b2e32d909e0fae (diff) | |
download | poky-e3af3f6915f7f4f2084eb37a47b115c5836f5b63.tar.gz |
ffmpeg: Fix CVE-2022-3109
Add patch to fix CVE-2022-3109
Link: https://github.com/FFmpeg/FFmpeg/commit/656cb0450aeb73b25d7d26980af342b37ac4c568
(From OE-Core rev: a626228a4be4c52c9d3f43eb1756c1defc22a5e4)
Signed-off-by: Bhabu Bindu <bhabu.bindu@kpit.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/ffmpeg')
-rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2022-3109.patch | 41 | ||||
-rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb | 1 |
2 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2022-3109.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2022-3109.patch new file mode 100644 index 0000000000..febf49cff2 --- /dev/null +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2022-3109.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 656cb0450aeb73b25d7d26980af342b37ac4c568 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jiasheng Jiang <jiasheng@iscas.ac.cn> | ||
3 | Date: Tue, 15 Feb 2022 17:58:08 +0800 | ||
4 | Subject: [PATCH] avcodec/vp3: Add missing check for av_malloc | ||
5 | |||
6 | Since the av_malloc() may fail and return NULL pointer, | ||
7 | it is needed that the 's->edge_emu_buffer' should be checked | ||
8 | whether the new allocation is success. | ||
9 | |||
10 | Fixes: d14723861b ("VP3: fix decoding of videos with stride > 2048") | ||
11 | |||
12 | CVE: CVE-2022-3109 | ||
13 | Upstream-Status: Backport [https://github.com/FFmpeg/FFmpeg/commit/656cb0450aeb73b25d7d26980af342b37ac4c568] | ||
14 | Comments: Refreshed hunk | ||
15 | |||
16 | Reviewed-by: Peter Ross <pross@xvid.org> | ||
17 | Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> | ||
18 | Signed-off-by: Bhabu Bindu <bhabu.bindu@kpit.com> | ||
19 | --- | ||
20 | libavcodec/vp3.c | 7 ++++++- | ||
21 | 1 file changed, 6 insertions(+), 1 deletion(-) | ||
22 | |||
23 | diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c | ||
24 | index e9ab54d73677..e2418eb6fa04 100644 | ||
25 | --- a/libavcodec/vp3.c | ||
26 | +++ b/libavcodec/vp3.c | ||
27 | @@ -2740,8 +2740,13 @@ | ||
28 | if (ff_thread_get_buffer(avctx, &s->current_frame, AV_GET_BUFFER_FLAG_REF) < 0) | ||
29 | goto error; | ||
30 | |||
31 | - if (!s->edge_emu_buffer) | ||
32 | + if (!s->edge_emu_buffer) { | ||
33 | s->edge_emu_buffer = av_malloc(9 * FFABS(s->current_frame.f->linesize[0])); | ||
34 | + if (!s->edge_emu_buffer) { | ||
35 | + ret = AVERROR(ENOMEM); | ||
36 | + goto error; | ||
37 | + } | ||
38 | + } | ||
39 | |||
40 | if (s->keyframe) { | ||
41 | if (!s->theora) { | ||
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb index cbfdbf0563..ffeec92e0e 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb | |||
@@ -30,6 +30,7 @@ SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ | |||
30 | file://CVE-2021-3566.patch \ | 30 | file://CVE-2021-3566.patch \ |
31 | file://CVE-2021-38291.patch \ | 31 | file://CVE-2021-38291.patch \ |
32 | file://CVE-2022-1475.patch \ | 32 | file://CVE-2022-1475.patch \ |
33 | file://CVE-2022-3109.patch \ | ||
33 | " | 34 | " |
34 | SRC_URI[md5sum] = "348956fc2faa57a2f79bbb84ded9fbc3" | 35 | SRC_URI[md5sum] = "348956fc2faa57a2f79bbb84ded9fbc3" |
35 | SRC_URI[sha256sum] = "cb754255ab0ee2ea5f66f8850e1bd6ad5cac1cd855d0a2f4990fb8c668b0d29c" | 36 | SRC_URI[sha256sum] = "cb754255ab0ee2ea5f66f8850e1bd6ad5cac1cd855d0a2f4990fb8c668b0d29c" |